diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/AbstractRemoteBean.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/AbstractRemoteBean.java
index 53e702bc3..1de840c8a 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/AbstractRemoteBean.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/AbstractRemoteBean.java
@@ -49,6 +49,7 @@ public abstract class AbstractRemoteBean extends ClosingUIBean implements Remote
     protected String errorNotifyTopics;
     protected String highlightColor;
     protected String highlightDuration;
+    protected String separateScripts;
     
     public AbstractRemoteBean(ValueStack stack, HttpServletRequest request,
             HttpServletResponse response) {
@@ -94,6 +95,8 @@ public abstract class AbstractRemoteBean extends ClosingUIBean implements Remote
             addParameter("highlightColor", findString(highlightColor));
         if (highlightDuration != null)
             addParameter("highlightDuration", findString(highlightDuration));
+        if (separateScripts != null)
+            addParameter("separateScripts", findValue(separateScripts, Boolean.class));
     }
 
     @Override
@@ -217,4 +220,9 @@ public abstract class AbstractRemoteBean extends ClosingUIBean implements Remote
     public void setHighlightDuration(String highlightDuration) {
         this.highlightDuration = highlightDuration;
     }
+    
+    @StrutsTagAttribute(description="Run scripts in a separate scope, unique for each tag", defaultValue="true")
+    public void setSeparateScripts(String separateScripts) {
+        this.separateScripts = separateScripts;
+    }
 }
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/RemoteBean.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/RemoteBean.java
index 5f7e0fa1a..52d79bb60 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/RemoteBean.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/RemoteBean.java
@@ -62,4 +62,6 @@ public interface RemoteBean {
     void setHighlightColor(String color);
     
     void setHighlightDuration(String color);
+    
+    void setSeparateScripts(String separateScripts);
 }
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java
index 34553d6f4..7661e3c33 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java
@@ -122,6 +122,7 @@ public class Submit extends FormButton implements RemoteBean {
     protected String highlightDuration;
     protected String validate;
     protected String ajaxAfterValidation;
+    protected String separateScripts;
     
     public Submit(ValueStack stack, HttpServletRequest request, HttpServletResponse response) {
         super(stack, request, response);
@@ -184,6 +185,8 @@ public class Submit extends FormButton implements RemoteBean {
             addParameter("highlightColor", findString(highlightColor));
         if (highlightDuration != null)
             addParameter("highlightDuration", findString(highlightDuration));
+        if (separateScripts != null)
+            addParameter("separateScripts", findValue(separateScripts, Boolean.class));
         
         Boolean validateValue = false;
         if (validate != null) {
@@ -387,4 +390,9 @@ public class Submit extends FormButton implements RemoteBean {
     public void setAction(String action) {
         super.setAction(action);
     }
+    
+    @StrutsTagAttribute(description="Run scripts in a separate scope, unique for each tag", defaultValue="true")
+    public void setSeparateScripts(String separateScripts) {
+        this.separateScripts = separateScripts;
+    }
 }
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AbstractRemoteTag.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AbstractRemoteTag.java
index 8883e403c..a35a543a3 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AbstractRemoteTag.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/AbstractRemoteTag.java
@@ -39,6 +39,7 @@ public abstract class AbstractRemoteTag extends AbstractClosingTag {
     protected String errorNotifyTopics;
     protected String highlightColor;
     protected String highlightDuration;
+    protected String separateScripts;
     
     protected void populateParams() {
         super.populateParams();
@@ -61,6 +62,7 @@ public abstract class AbstractRemoteTag extends AbstractClosingTag {
         remote.setErrorNotifyTopics(errorNotifyTopics);
         remote.setHighlightColor(highlightColor);
         remote.setHighlightDuration(highlightDuration);
+        remote.setSeparateScripts(separateScripts);
     }
 
     public void setHref(String href) {
@@ -130,4 +132,8 @@ public abstract class AbstractRemoteTag extends AbstractClosingTag {
     public void setHighlightDuration(String highlightDuration) {
         this.highlightDuration = highlightDuration;
     }
+
+    public void setSeparateScripts(String separateScripts) {
+        this.separateScripts = separateScripts;
+    }
 }
diff --git a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/SubmitTag.java b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/SubmitTag.java
index cd993f838..b666e3376 100644
--- a/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/SubmitTag.java
+++ b/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/SubmitTag.java
@@ -60,6 +60,7 @@ public class SubmitTag extends AbstractUITag {
     protected String highlightDuration;
     protected String validate;
     protected String ajaxAfterValidation;
+    protected String separateScripts;
     
     public Component getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) {
         return new Submit(stack, req, res);
@@ -93,6 +94,7 @@ public class SubmitTag extends AbstractUITag {
         submit.setHighlightDuration(highlightDuration);
         submit.setValidate(validate);
         submit.setAjaxAfterValidation(ajaxAfterValidation);
+        submit.setSeparateScripts(separateScripts);
     }
 
     public void setMethod(String method) {
@@ -194,4 +196,8 @@ public class SubmitTag extends AbstractUITag {
     public void setAjaxAfterValidation(String ajaxAfterValidation) {
         this.ajaxAfterValidation = ajaxAfterValidation;
     }
+
+    public void setSeparateScripts(String separateScripts) {
+        this.separateScripts = separateScripts;
+    }
 }
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/Bind.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/Bind.js
index 5753d5e28..29f40c04a 100644
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/Bind.js
+++ b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/Bind.js
@@ -9,6 +9,7 @@ dojo.widget.defineWidget(
   dojo.widget.HtmlWidget, {
   widgetType : "Bind",
   executeScripts : false,
+  scriptSeparation : false,
   targets : "",
   targetsArray : null,
   href : "",
@@ -46,6 +47,13 @@ dojo.widget.defineWidget(
   validate : false,
   ajaxAfterValidation : false,
   
+  //used for scripts downloading & caching
+  cacheContent : true,
+  //run script on its own scope
+  scriptSeparation : true,
+  //scope for the cript separation
+  scriptScope : null,
+   
   postCreate : function() {
     var self = this;
 
@@ -183,14 +191,7 @@ dojo.widget.defineWidget(
       if(this.executeScripts) {
         //update targets content
         var parsed = this.parse(data);
-        //eval scripts
-        if(parsed.scripts && parsed.scripts.length > 0) {
-          var scripts = "";
-          for(var i = 0; i < parsed.scripts.length; i++){
-            scripts += parsed.scripts[i];
-          }
-          (new Function('_container_', scripts+'; return this;'))(this);
-        }
+        this._executeScripts(parsed.scripts);
         this.setContent(parsed.text);
       }
       else {
@@ -365,7 +366,65 @@ dojo.widget.defineWidget(
       text: s,
       scripts: scripts
     };
-  }
+  }, 
+  
+  //from Dojo content pane
+  _executeScripts : function (scripts) {
+    var self = this;
+    var tmp = "", code = "";
+    for (var i = 0; i < scripts.length; i++) {
+        if (scripts[i].path) {
+            dojo.io.bind(this._cacheSetting({"url":scripts[i].path, "load":function (type, scriptStr) {
+                dojo.lang.hitch(self, tmp = ";" + scriptStr);
+            }, "error":function (type, error) {
+                error.text = type + " downloading remote script";
+                self._handleDefaults.call(self, error, "onExecError", "debug");
+            }, "mimetype":"text/plain", "sync":true}, this.cacheContent));
+            code += tmp;
+        } else {
+            code += scripts[i];
+        }
+    }
+    try {
+        if (this.scriptSeparation) {
+            delete this.scriptScope;
+            this.scriptScope = new (new Function("_container_", code + "; return this;"))(self);
+        } else {
+            var djg = dojo.global();
+            if (djg.execScript) {
+                djg.execScript(code);
+            } else {
+                var djd = dojo.doc();
+                var sc = djd.createElement("script");
+                sc.appendChild(djd.createTextNode(code));
+                (this.containerNode || this.domNode).appendChild(sc);
+            }
+        }
+    }
+    catch (e) {
+        e.text = "Error running scripts from content:\n" + e.description;
+        this.log(e);
+    }
+ },
+ 
+ _cacheSetting : function (bindObj, useCache) {
+    for (var x in this.bindArgs) {
+        if (dojo.lang.isUndefined(bindObj[x])) {
+            bindObj[x] = this.bindArgs[x];
+        }
+    }
+    if (dojo.lang.isUndefined(bindObj.useCache)) {
+        bindObj.useCache = useCache;
+    }
+    if (dojo.lang.isUndefined(bindObj.preventCache)) {
+        bindObj.preventCache = !useCache;
+    }
+    if (dojo.lang.isUndefined(bindObj.mimetype)) {
+        bindObj.mimetype = "text/html";
+    }
+    return bindObj;
+ }
+ 
 });
 
 
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/BindDiv.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/BindDiv.js
index 25ebeffa4..99c83b1d4 100644
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/BindDiv.js
+++ b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts/widget/BindDiv.js
@@ -294,7 +294,7 @@ dojo.widget.defineWidget(
     },
     
     //from Dojo's ContentPane
-    //TODO: remove when fixed on Dojo
+    //TODO: remove when fixed on Dojo (WW-1869)
     splitAndFixPaths:function (s, url) {
       var titles = [], scripts = [], tmp = [];
       var match = [], requires = [], attr = [], styles = [];
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js
index cfdcd7976..324339886 100644
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js
+++ b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js
@@ -13599,7 +13599,7 @@ self.addKeyHandler(item[1]?item[1]:item[0].charAt(0),item[2]==undefined?self.KEY
 });
 }});
 dojo.provide("struts.widget.Bind");
-dojo.widget.defineWidget("struts.widget.Bind",dojo.widget.HtmlWidget,{widgetType:"Bind",executeScripts:false,targets:"",targetsArray:null,href:"",handler:"",loadingText:"Loading...",errorText:"",showError:true,showLoading:false,listenTopics:"",notifyTopics:"",notifyTopicsArray:null,beforeNotifyTopics:"",beforeNotifyTopicsArray:null,afterNotifyTopics:"",afterNotifyTopicsArray:null,errorNotifyTopics:"",errorNotifyTopicsArray:null,formId:"",formFilter:"",formNode:null,events:"",indicator:"",parseContent:true,highlightColor:"",highlightDuration:2000,validate:false,ajaxAfterValidation:false,postCreate:function(){
+dojo.widget.defineWidget("struts.widget.Bind",dojo.widget.HtmlWidget,{widgetType:"Bind",executeScripts:false,scriptSeparation:false,targets:"",targetsArray:null,href:"",handler:"",loadingText:"Loading...",errorText:"",showError:true,showLoading:false,listenTopics:"",notifyTopics:"",notifyTopicsArray:null,beforeNotifyTopics:"",beforeNotifyTopicsArray:null,afterNotifyTopics:"",afterNotifyTopicsArray:null,errorNotifyTopics:"",errorNotifyTopicsArray:null,formId:"",formFilter:"",formNode:null,events:"",indicator:"",parseContent:true,highlightColor:"",highlightDuration:2000,validate:false,ajaxAfterValidation:false,cacheContent:true,scriptSeparation:true,scriptScope:null,postCreate:function(){
 var self=this;
 if(!dojo.string.isBlank(this.listenTopics)){
 this.log("Listening to "+this.listenTopics+" to refresh");
@@ -13698,13 +13698,7 @@ return;
 }
 if(this.executeScripts){
 var _b87=this.parse(data);
-if(_b87.scripts&&_b87.scripts.length>0){
-var _b88="";
-for(var i=0;i<_b87.scripts.length;i++){
-_b88+=_b87.scripts[i];
-}
-(new Function("_container_",_b88+"; return this;"))(this);
-}
+this._executeScripts(_b87.scripts);
 this.setContent(_b87.text);
 }else{
 this.setContent(data);
@@ -13712,23 +13706,23 @@ this.setContent(data);
 this.highlight();
 }else{
 if(this.showError){
-var _b8a=dojo.string.isBlank(this.errorText)?e.message:this.errorText;
-this.setContent(_b8a);
+var _b88=dojo.string.isBlank(this.errorText)?e.message:this.errorText;
+this.setContent(_b88);
 }
 }
 },notify:function(data,type,e){
 var self=this;
 if(this.notifyTopicsArray){
-dojo.lang.forEach(this.notifyTopicsArray,function(_b8f){
+dojo.lang.forEach(this.notifyTopicsArray,function(_b8d){
 try{
-dojo.event.topic.publish(_b8f,data,type,e,self);
+dojo.event.topic.publish(_b8d,data,type,e,self);
 }
 catch(ex){
 self.log(ex);
 }
 });
 }
-var _b90=null;
+var _b8e=null;
 switch(type){
 case "before":
 this.notifyTo(this.beforeNotifyTopicsArray,null,e);
@@ -13740,15 +13734,15 @@ case "error":
 this.notifyTo(this.errorNotifyTopicsArray,data,e);
 break;
 }
-},notifyTo:function(_b91,data,e){
+},notifyTo:function(_b8f,data,e){
 var self=this;
-if(_b91){
-dojo.lang.forEach(_b91,function(_b95){
+if(_b8f){
+dojo.lang.forEach(_b8f,function(_b93){
 try{
 if(data){
-dojo.event.topic.publish(_b95,data,e,self);
+dojo.event.topic.publish(_b93,data,e,self);
 }else{
-dojo.event.topic.publish(_b95,e,self);
+dojo.event.topic.publish(_b93,e,self);
 }
 }
 catch(ex){
@@ -13756,9 +13750,9 @@ self.log(ex);
 }
 });
 }
-},onDownloadStart:function(_b96){
+},onDownloadStart:function(_b94){
 if(this.showLoading&&!dojo.string.isBlank(this.loadingText)){
-_b96.text=this.loadingText;
+_b94.text=this.loadingText;
 }
 },reloadContents:function(evt){
 if(!dojo.string.isBlank(this.handler)){
@@ -13767,9 +13761,9 @@ window[this.handler](this,this.domNode);
 }else{
 try{
 var self=this;
-var _b99={cancel:false};
-this.notify(this.widgetId,"before",_b99);
-if(_b99.cancel){
+var _b97={cancel:false};
+this.notify(this.widgetId,"before",_b97);
+if(_b97.cancel){
 this.log("Request canceled");
 return;
 }
@@ -13777,8 +13771,8 @@ if(dojo.string.isBlank(this.href)){
 return;
 }
 if(!this.validate&&this.formNode&&this.formNode.onsubmit!=null){
-var _b9a=this.formNode.onsubmit.call(evt);
-if(_b9a!=null&&!_b9a){
+var _b98=this.formNode.onsubmit.call(evt);
+if(_b98!=null&&!_b98){
 this.log("Request canceled by 'onsubmit' of the form");
 return;
 }
@@ -13787,33 +13781,33 @@ dojo.html.show(this.indicator);
 if(this.showLoading){
 this.setContent(this.loadingText);
 }
-var _b9b=this.href;
+var _b99=this.href;
 if(!this.ajaxAfterValidation&&this.validate){
-_b9b=_b9b+(_b9b.indexOf("?")>-1?"&":"?")+"struts.validateOnly=true";
+_b99=_b99+(_b99.indexOf("?")>-1?"&":"?")+"struts.validateOnly=true";
 }
-dojo.io.bind({url:_b9b,useCache:false,preventCache:true,formNode:self.formNode,formFilter:window[self.formFilter],handler:function(type,data,e){
+dojo.io.bind({url:_b99,useCache:false,preventCache:true,formNode:self.formNode,formFilter:window[self.formFilter],handler:function(type,data,e){
 dojo.lang.hitch(self,"bindHandler")(type,data,e);
 },mimetype:"text/html"});
 }
 catch(ex){
 if(this.showError){
-var _b9f=dojo.string.isBlank(this.errorText)?ex:this.errorText;
-this.setContent(_b9f);
+var _b9d=dojo.string.isBlank(this.errorText)?ex:this.errorText;
+this.setContent(_b9d);
 }
 }
 }
 },parse:function(s){
 this.log("Parsing: "+s);
-var _ba1=[];
+var _b9f=[];
 var tmp=[];
-var _ba3=[];
-while(_ba1){
-_ba1=s.match(/<script([^>]*)>([\s\S]*?)<\/script>/i);
-if(!_ba1){
+var _ba1=[];
+while(_b9f){
+_b9f=s.match(/<script([^>]*)>([\s\S]*?)<\/script>/i);
+if(!_b9f){
 break;
 }
-if(_ba1[1]){
-attr=_ba1[1].match(/src=(['"]?)([^"']*)\1/i);
+if(_b9f[1]){
+attr=_b9f[1].match(/src=(['"]?)([^"']*)\1/i);
 if(attr){
 var tmp2=attr[2].search(/.*(\bdojo\b(?:\.uncompressed)?\.js)$/);
 if(tmp2>-1){
@@ -13821,8 +13815,8 @@ this.log("Security note! inhibit:"+attr[2]+" from  beeing loaded again.");
 }
 }
 }
-if(_ba1[2]){
-var sc=_ba1[2].replace(/(?:var )?\bdjConfig\b(?:[\s]*=[\s]*\{[^}]+\}|\.[\w]*[\s]*=[\s]*[^;\n]*)?;?|dojo\.hostenv\.writeIncludes\(\s*\);?/g,"");
+if(_b9f[2]){
+var sc=_b9f[2].replace(/(?:var )?\bdjConfig\b(?:[\s]*=[\s]*\{[^}]+\}|\.[\w]*[\s]*=[\s]*[^;\n]*)?;?|dojo\.hostenv\.writeIncludes\(\s*\);?/g,"");
 if(!sc){
 continue;
 }
@@ -13834,26 +13828,78 @@ break;
 }
 sc=sc.replace(tmp[0],"");
 }
-_ba3.push(sc);
+_ba1.push(sc);
 }
 s=s.replace(/<script[^>]*>[\s\S]*?<\/script>/i,"");
 }
-return {text:s,scripts:_ba3};
+return {text:s,scripts:_ba1};
+},_executeScripts:function(_ba4){
+var self=this;
+var tmp="",code="";
+for(var i=0;i<_ba4.length;i++){
+if(_ba4[i].path){
+dojo.io.bind(this._cacheSetting({"url":_ba4[i].path,"load":function(type,_baa){
+dojo.lang.hitch(self,tmp=";"+_baa);
+},"error":function(type,_bac){
+_bac.text=type+" downloading remote script";
+self._handleDefaults.call(self,_bac,"onExecError","debug");
+},"mimetype":"text/plain","sync":true},this.cacheContent));
+code+=tmp;
+}else{
+code+=_ba4[i];
+}
+}
+try{
+if(this.scriptSeparation){
+delete this.scriptScope;
+this.scriptScope=new (new Function("_container_",code+"; return this;"))(self);
+}else{
+var djg=dojo.global();
+if(djg.execScript){
+djg.execScript(code);
+}else{
+var djd=dojo.doc();
+var sc=djd.createElement("script");
+sc.appendChild(djd.createTextNode(code));
+(this.containerNode||this.domNode).appendChild(sc);
+}
+}
+}
+catch(e){
+e.text="Error running scripts from content:\n"+e.description;
+this.log(e);
+}
+},_cacheSetting:function(_bb0,_bb1){
+for(var x in this.bindArgs){
+if(dojo.lang.isUndefined(_bb0[x])){
+_bb0[x]=this.bindArgs[x];
+}
+}
+if(dojo.lang.isUndefined(_bb0.useCache)){
+_bb0.useCache=_bb1;
+}
+if(dojo.lang.isUndefined(_bb0.preventCache)){
+_bb0.preventCache=!_bb1;
+}
+if(dojo.lang.isUndefined(_bb0.mimetype)){
+_bb0.mimetype="text/html";
+}
+return _bb0;
 }});
 dojo.provide("dojo.lang.timing.Timer");
-dojo.lang.timing.Timer=function(_ba6){
+dojo.lang.timing.Timer=function(_bb3){
 this.timer=null;
 this.isRunning=false;
-this.interval=_ba6;
+this.interval=_bb3;
 this.onStart=null;
 this.onStop=null;
 };
 dojo.extend(dojo.lang.timing.Timer,{onTick:function(){
-},setInterval:function(_ba7){
+},setInterval:function(_bb4){
 if(this.isRunning){
 dj_global.clearInterval(this.timer);
 }
-this.interval=_ba7;
+this.interval=_bb4;
 if(this.isRunning){
 this.timer=dj_global.setInterval(dojo.lang.hitch(this,"onTick"),this.interval);
 }
@@ -13871,46 +13917,46 @@ this.isRunning=false;
 dj_global.clearInterval(this.timer);
 }});
 dojo.provide("struts.widget.BindDiv");
-dojo.widget.defineWidget("struts.widget.BindDiv",dojo.widget.ContentPane,{widgetType:"BindDiv",href:"",extractContent:false,parseContent:false,cacheContent:false,refreshOnShow:false,executeScripts:false,preload:true,updateFreq:0,delay:0,autoStart:true,timer:null,loadingText:"Loading...",showLoading:false,errorText:"",showError:true,listenTopics:"",notifyTopics:"",notifyTopicsArray:null,stopTimerListenTopics:"",startTimerListenTopics:"",beforeNotifyTopics:"",beforeNotifyTopicsArray:null,afterNotifyTopics:"",afterNotifyTopicsArray:null,errorNotifyTopics:"",errorNotifyTopicsArray:null,beforeLoading:"",afterLoading:"",formId:"",formFilter:"",indicator:"",parseContent:true,highlightColor:"",highlightDuration:2000,disabled:false,onDownloadStart:function(_ba8){
+dojo.widget.defineWidget("struts.widget.BindDiv",dojo.widget.ContentPane,{widgetType:"BindDiv",href:"",extractContent:false,parseContent:false,cacheContent:false,refreshOnShow:false,executeScripts:false,preload:true,updateFreq:0,delay:0,autoStart:true,timer:null,loadingText:"Loading...",showLoading:false,errorText:"",showError:true,listenTopics:"",notifyTopics:"",notifyTopicsArray:null,stopTimerListenTopics:"",startTimerListenTopics:"",beforeNotifyTopics:"",beforeNotifyTopicsArray:null,afterNotifyTopics:"",afterNotifyTopicsArray:null,errorNotifyTopics:"",errorNotifyTopicsArray:null,beforeLoading:"",afterLoading:"",formId:"",formFilter:"",indicator:"",parseContent:true,highlightColor:"",highlightDuration:2000,disabled:false,onDownloadStart:function(_bb5){
 if(!this.showLoading){
-_ba8.returnValue=false;
+_bb5.returnValue=false;
 return;
 }
 if(this.showLoading&&!dojo.string.isBlank(this.loadingText)){
-_ba8.text=this.loadingText;
+_bb5.text=this.loadingText;
 }
 },highlight:function(){
 if(!dojo.string.isBlank(this.highlightColor)){
-var _ba9=dojo.lfx.html.highlight([this.domNode],this.highlightColor,this.highlightDuration);
-_ba9.play();
+var _bb6=dojo.lfx.html.highlight([this.domNode],this.highlightColor,this.highlightDuration);
+_bb6.play();
 }
-},onDownloadError:function(_baa){
-this.onError(_baa);
-},onContentError:function(_bab){
-this.onError(_bab);
-},onExecError:function(_bac){
-this.onError(_bac);
-},onError:function(_bad){
+},onDownloadError:function(_bb7){
+this.onError(_bb7);
+},onContentError:function(_bb8){
+this.onError(_bb8);
+},onExecError:function(_bb9){
+this.onError(_bb9);
+},onError:function(_bba){
 if(this.showError){
 if(!dojo.string.isBlank(this.errorText)){
-_bad.text=this.errorText;
+_bba.text=this.errorText;
 }
 }else{
-_bad.text="";
+_bba.text="";
 }
 },notify:function(data,type,e){
 if(this.notifyTopicsArray){
 var self=this;
-dojo.lang.forEach(this.notifyTopicsArray,function(_bb2){
+dojo.lang.forEach(this.notifyTopicsArray,function(_bbf){
 try{
-dojo.event.topic.publish(_bb2,data,type,e,self);
+dojo.event.topic.publish(_bbf,data,type,e,self);
 }
 catch(ex){
 self.log(ex);
 }
 });
 }
-var _bb3=null;
+var _bc0=null;
 switch(type){
 case "before":
 this.notifyTo(this.beforeNotifyTopicsArray,null,e);
@@ -13922,15 +13968,15 @@ case "error":
 this.notifyTo(this.errorNotifyTopicsArray,data,e);
 break;
 }
-},notifyTo:function(_bb4,data,e){
+},notifyTo:function(_bc1,data,e){
 var self=this;
-if(_bb4){
-dojo.lang.forEach(_bb4,function(_bb8){
+if(_bc1){
+dojo.lang.forEach(_bc1,function(_bc5){
 try{
 if(data){
-dojo.event.topic.publish(_bb8,data,e,self);
+dojo.event.topic.publish(_bc5,data,e,self);
 }else{
-dojo.event.topic.publish(_bb8,e,self);
+dojo.event.topic.publish(_bc5,e,self);
 }
 }
 catch(ex){
@@ -13943,51 +13989,51 @@ if(this.handler!==""){
 this.setHandler(this.handler);
 }
 var self=this;
-var _bbc=function(){
+var _bc9=function(){
 dojo.lang.hitch(self,"refresh")();
 };
-var _bbd=function(){
+var _bca=function(){
 dojo.lang.hitch(self,"startTimer")();
 };
 if(this.updateFreq>0){
 this.timer=new dojo.lang.timing.Timer(this.updateFreq);
-this.timer.onTick=_bbc;
+this.timer.onTick=_bc9;
 if(this.autoStart){
 if(this.delay>0){
-dojo.lang.setTimeout(_bbd,this.delay);
+dojo.lang.setTimeout(_bca,this.delay);
 }else{
 this.startTimer();
 }
 }
 }else{
 if(this.delay>0){
-dojo.lang.setTimeout(_bbc,this.delay);
+dojo.lang.setTimeout(_bc9,this.delay);
 }
 }
 if(!dojo.string.isBlank(this.listenTopics)){
 this.log("Listening to "+this.listenTopics+" to refresh");
-var _bbe=this.listenTopics.split(",");
-if(_bbe){
-dojo.lang.forEach(_bbe,function(_bbf){
-dojo.event.topic.subscribe(_bbf,self,"refresh");
+var _bcb=this.listenTopics.split(",");
+if(_bcb){
+dojo.lang.forEach(_bcb,function(_bcc){
+dojo.event.topic.subscribe(_bcc,self,"refresh");
 });
 }
 }
 if(!dojo.string.isBlank(this.stopTimerListenTopics)){
 this.log("Listening to "+this.stopTimerListenTopics+" to stop timer");
-var _bc0=this.stopTimerListenTopics.split(",");
-if(_bc0){
-dojo.lang.forEach(_bc0,function(_bc1){
-dojo.event.topic.subscribe(_bc1,self,"stopTimer");
+var _bcd=this.stopTimerListenTopics.split(",");
+if(_bcd){
+dojo.lang.forEach(_bcd,function(_bce){
+dojo.event.topic.subscribe(_bce,self,"stopTimer");
 });
 }
 }
 if(!dojo.string.isBlank(this.startTimerListenTopics)){
 this.log("Listening to "+this.stopTimerListenTopics+" to start timer");
-var _bc2=this.startTimerListenTopics.split(",");
-if(_bc2){
-dojo.lang.forEach(_bc2,function(_bc3){
-dojo.event.topic.subscribe(_bc3,self,"startTimer");
+var _bcf=this.startTimerListenTopics.split(",");
+if(_bcf){
+dojo.lang.forEach(_bcf,function(_bd0){
+dojo.event.topic.subscribe(_bd0,self,"startTimer");
 });
 }
 }
@@ -14006,16 +14052,16 @@ this.errorNotifyTopicsArray=this.errorNotifyTopics.split(",");
 if(this.isShowing()&&this.preload&&this.updateFreq<=0&&this.delay<=0){
 this.refresh();
 }
-},_downloadExternalContent:function(url,_bc5){
-var _bc6={cancel:false};
-this.notify(this.widgetId,"before",_bc6);
-if(_bc6.cancel){
+},_downloadExternalContent:function(url,_bd2){
+var _bd3={cancel:false};
+this.notify(this.widgetId,"before",_bd3);
+if(_bd3.cancel){
 return;
 }
 dojo.html.show(this.indicator);
 this._handleDefaults("Loading...","onDownloadStart");
 var self=this;
-dojo.io.bind({url:url,useCache:_bc5,preventCache:!_bc5,mimetype:"text/html",formNode:dojo.byId(self.formId),formFilter:window[self.formFilter],handler:function(type,data,e){
+dojo.io.bind({url:url,useCache:_bd2,preventCache:!_bd2,mimetype:"text/html",formNode:dojo.byId(self.formId),formFilter:window[self.formFilter],handler:function(type,data,e){
 dojo.html.hide(self.indicator);
 self.notify(data,type,e);
 if(type=="load"){
@@ -14039,109 +14085,109 @@ this.log("starting timer with update interval "+this.updateFreq);
 this.timer.start();
 }
 },splitAndFixPaths:function(s,url){
-var _bce=[],_bcf=[],tmp=[];
-var _bd1=[],_bd2=[],attr=[],_bd4=[];
-var str="",path="",fix="",_bd8="",tag="",_bda="";
+var _bdb=[],_bdc=[],tmp=[];
+var _bde=[],_bdf=[],attr=[],_be1=[];
+var str="",path="",fix="",_be5="",tag="",_be7="";
 if(!url){
 url="./";
 }
 if(s){
-var _bdb=/<title[^>]*>([\s\S]*?)<\/title>/i;
-while(_bd1=_bdb.exec(s)){
-_bce.push(_bd1[1]);
-s=s.substring(0,_bd1.index)+s.substr(_bd1.index+_bd1[0].length);
+var _be8=/<title[^>]*>([\s\S]*?)<\/title>/i;
+while(_bde=_be8.exec(s)){
+_bdb.push(_bde[1]);
+s=s.substring(0,_bde.index)+s.substr(_bde.index+_bde[0].length);
 }
 if(this.adjustPaths){
-var _bdc=/<[a-z][a-z0-9]*[^>]*\s(?:(?:src|href|style)=[^>])+[^>]*>/i;
-var _bdd=/\s(src|href|style)=(['"]?)([\w()\[\]\/.,\\'"-:;#=&?\s@!]+?)\2/i;
-var _bde=/^(?:[#]|(?:(?:https?|ftps?|file|javascript|mailto|news):))/;
-while(tag=_bdc.exec(s)){
+var _be9=/<[a-z][a-z0-9]*[^>]*\s(?:(?:src|href|style)=[^>])+[^>]*>/i;
+var _bea=/\s(src|href|style)=(['"]?)([\w()\[\]\/.,\\'"-:;#=&?\s@!]+?)\2/i;
+var _beb=/^(?:[#]|(?:(?:https?|ftps?|file|javascript|mailto|news):))/;
+while(tag=_be9.exec(s)){
 str+=s.substring(0,tag.index);
 s=s.substring((tag.index+tag[0].length),s.length);
 tag=tag[0];
-_bd8="";
-while(attr=_bdd.exec(tag)){
+_be5="";
+while(attr=_bea.exec(tag)){
 path="";
-_bda=attr[3];
+_be7=attr[3];
 switch(attr[1].toLowerCase()){
 case "src":
 case "href":
-if(_bde.exec(_bda)){
-path=_bda;
+if(_beb.exec(_be7)){
+path=_be7;
 }else{
-path=(new dojo.uri.Uri(url,_bda).toString());
+path=(new dojo.uri.Uri(url,_be7).toString());
 }
 break;
 case "style":
-path=dojo.html.fixPathsInCssText(_bda,url);
+path=dojo.html.fixPathsInCssText(_be7,url);
 break;
 default:
-path=_bda;
+path=_be7;
 }
 fix=" "+attr[1]+"="+attr[2]+path+attr[2];
-_bd8+=tag.substring(0,attr.index)+fix;
+_be5+=tag.substring(0,attr.index)+fix;
 tag=tag.substring((attr.index+attr[0].length),tag.length);
 }
-str+=_bd8+tag;
+str+=_be5+tag;
 }
 s=str+s;
 }
-_bdb=/(?:<(style)[^>]*>([\s\S]*?)<\/style>|<link ([^>]*rel=['"]?stylesheet['"]?[^>]*)>)/i;
-while(_bd1=_bdb.exec(s)){
-if(_bd1[1]&&_bd1[1].toLowerCase()=="style"){
-_bd4.push(dojo.html.fixPathsInCssText(_bd1[2],url));
+_be8=/(?:<(style)[^>]*>([\s\S]*?)<\/style>|<link ([^>]*rel=['"]?stylesheet['"]?[^>]*)>)/i;
+while(_bde=_be8.exec(s)){
+if(_bde[1]&&_bde[1].toLowerCase()=="style"){
+_be1.push(dojo.html.fixPathsInCssText(_bde[2],url));
 }else{
-if(attr=_bd1[3].match(/href=(['"]?)([^'">]*)\1/i)){
-_bd4.push({path:attr[2]});
+if(attr=_bde[3].match(/href=(['"]?)([^'">]*)\1/i)){
+_be1.push({path:attr[2]});
 }
 }
-s=s.substring(0,_bd1.index)+s.substr(_bd1.index+_bd1[0].length);
+s=s.substring(0,_bde.index)+s.substr(_bde.index+_bde[0].length);
 }
-var _bdb=/<script([^>]*)>([\s\S]*?)<\/script>/i;
-var _bdf=/src=(['"]?)([^"']*)\1/i;
-var _be0=/.*(\bdojo\b\.js(?:\.uncompressed\.js)?)$/;
-var _be1=/(?:var )?\bdjConfig\b(?:[\s]*=[\s]*\{[^}]+\}|\.[\w]*[\s]*=[\s]*[^;\n]*)?;?|dojo\.hostenv\.writeIncludes\(\s*\);?/g;
-var _be2=/dojo\.(?:(?:require(?:After)?(?:If)?)|(?:widget\.(?:manager\.)?registerWidgetPackage)|(?:(?:hostenv\.)?setModulePrefix|registerModulePath)|defineNamespace)\((['"]).*?\1\)\s*;?/;
-while(_bd1=_bdb.exec(s)){
-if(this.executeScripts&&_bd1[1]){
-if(attr=_bdf.exec(_bd1[1])){
-if(_be0.exec(attr[2])){
+var _be8=/<script([^>]*)>([\s\S]*?)<\/script>/i;
+var _bec=/src=(['"]?)([^"']*)\1/i;
+var _bed=/.*(\bdojo\b\.js(?:\.uncompressed\.js)?)$/;
+var _bee=/(?:var )?\bdjConfig\b(?:[\s]*=[\s]*\{[^}]+\}|\.[\w]*[\s]*=[\s]*[^;\n]*)?;?|dojo\.hostenv\.writeIncludes\(\s*\);?/g;
+var _bef=/dojo\.(?:(?:require(?:After)?(?:If)?)|(?:widget\.(?:manager\.)?registerWidgetPackage)|(?:(?:hostenv\.)?setModulePrefix|registerModulePath)|defineNamespace)\((['"]).*?\1\)\s*;?/;
+while(_bde=_be8.exec(s)){
+if(this.executeScripts&&_bde[1]){
+if(attr=_bec.exec(_bde[1])){
+if(_bed.exec(attr[2])){
 dojo.debug("Security note! inhibit:"+attr[2]+" from  being loaded again.");
 }else{
-_bcf.push({path:attr[2]});
+_bdc.push({path:attr[2]});
 }
 }
 }
-if(_bd1[2]){
-var sc=_bd1[2].replace(_be1,"");
+if(_bde[2]){
+var sc=_bde[2].replace(_bee,"");
 if(!sc){
 continue;
 }
-while(tmp=_be2.exec(sc)){
-_bd2.push(tmp[0]);
+while(tmp=_bef.exec(sc)){
+_bdf.push(tmp[0]);
 sc=sc.substring(0,tmp.index)+sc.substr(tmp.index+tmp[0].length);
 }
 if(this.executeScripts){
-_bcf.push(sc);
+_bdc.push(sc);
 }
 }
-s=s.substr(0,_bd1.index)+s.substr(_bd1.index+_bd1[0].length);
+s=s.substr(0,_bde.index)+s.substr(_bde.index+_bde[0].length);
 }
 if(this.extractContent){
-_bd1=s.match(/<body[^>]*>\s*([\s\S]+)\s*<\/body>/im);
-if(_bd1){
-s=_bd1[1];
+_bde=s.match(/<body[^>]*>\s*([\s\S]+)\s*<\/body>/im);
+if(_bde){
+s=_bde[1];
 }
 }
 if(this.executeScripts&&this.scriptSeparation){
-var _bdb=/(<[a-zA-Z][a-zA-Z0-9]*\s[^>]*?\S=)((['"])[^>]*scriptScope[^>]*>)/;
-var _be4=/([\s'";:\(])scriptScope(.*)/;
+var _be8=/(<[a-zA-Z][a-zA-Z0-9]*\s[^>]*?\S=)((['"])[^>]*scriptScope[^>]*>)/;
+var _bf1=/([\s'";:\(])scriptScope(.*)/;
 str="";
-while(tag=_bdb.exec(s)){
+while(tag=_be8.exec(s)){
 tmp=((tag[3]=="'")?"\"":"'");
 fix="";
 str+=s.substring(0,tag.index)+tag[1];
-while(attr=_be4.exec(tag[2])){
+while(attr=_bf1.exec(tag[2])){
 tag[2]=tag[2].substring(0,attr.index)+attr[1]+"dojo.widget.byId("+tmp+this.widgetId+tmp+").scriptScope"+attr[2];
 }
 str+=tag[2];
@@ -14150,7 +14196,7 @@ s=s.substr(tag.index+tag[0].length);
 s=str+s;
 }
 }
-return {"xml":s,"styles":_bd4,"titles":_bce,"requires":_bd2,"scripts":_bcf,"url":url};
+return {"xml":s,"styles":_be1,"titles":_bdb,"requires":_bdf,"scripts":_bdc,"url":url};
 }});
 dojo.provide("struts.widget.BindAnchor");
 dojo.widget.defineWidget("struts.widget.BindAnchor",struts.widget.Bind,{widgetType:"BindAnchor",events:"onclick",postCreate:function(){
@@ -14163,10 +14209,10 @@ dojo.widget.html.stabile.getState=function(id){
 dojo.widget.html.stabile.setup();
 return dojo.widget.html.stabile.widgetState[id];
 };
-dojo.widget.html.stabile.setState=function(id,_be7,_be8){
+dojo.widget.html.stabile.setState=function(id,_bf4,_bf5){
 dojo.widget.html.stabile.setup();
-dojo.widget.html.stabile.widgetState[id]=_be7;
-if(_be8){
+dojo.widget.html.stabile.widgetState[id]=_bf4;
+if(_bf5){
 dojo.widget.html.stabile.commit(dojo.widget.html.stabile.widgetState);
 }
 };
@@ -14176,12 +14222,12 @@ var text=dojo.widget.html.stabile._getStorage().value;
 dojo.widget.html.stabile.widgetState=text?dj_eval("("+text+")"):{};
 }
 };
-dojo.widget.html.stabile.commit=function(_bea){
-dojo.widget.html.stabile._getStorage().value=dojo.widget.html.stabile.description(_bea);
+dojo.widget.html.stabile.commit=function(_bf7){
+dojo.widget.html.stabile._getStorage().value=dojo.widget.html.stabile.description(_bf7);
 };
-dojo.widget.html.stabile.description=function(v,_bec){
-var _bed=dojo.widget.html.stabile._depth;
-var _bee=function(){
+dojo.widget.html.stabile.description=function(v,_bf9){
+var _bfa=dojo.widget.html.stabile._depth;
+var _bfb=function(){
 return this.description(this,true);
 };
 try{
@@ -14205,53 +14251,53 @@ return "new Date("+d.getFullYear+","+d.getMonth()+","+d.getDate()+")";
 }
 var d;
 if(v instanceof Array||v.push){
-if(_bed>=dojo.widget.html.stabile.depthLimit){
+if(_bfa>=dojo.widget.html.stabile.depthLimit){
 return "[ ... ]";
 }
 d="[";
-var _bf1=true;
+var _bfe=true;
 dojo.widget.html.stabile._depth++;
 for(var i=0;i<v.length;i++){
-if(_bf1){
-_bf1=false;
+if(_bfe){
+_bfe=false;
 }else{
 d+=",";
 }
-d+=arguments.callee(v[i],_bec);
+d+=arguments.callee(v[i],_bf9);
 }
 return d+"]";
 }
-if(v.constructor==Object||v.toString==_bee){
-if(_bed>=dojo.widget.html.stabile.depthLimit){
+if(v.constructor==Object||v.toString==_bfb){
+if(_bfa>=dojo.widget.html.stabile.depthLimit){
 return "{ ... }";
 }
 if(typeof (v.hasOwnProperty)!="function"&&v.prototype){
 throw new Error("description: "+v+" not supported by script engine");
 }
-var _bf1=true;
+var _bfe=true;
 d="{";
 dojo.widget.html.stabile._depth++;
 for(var key in v){
 if(v[key]==void (0)||typeof (v[key])=="function"){
 continue;
 }
-if(_bf1){
-_bf1=false;
+if(_bfe){
+_bfe=false;
 }else{
 d+=", ";
 }
 var kd=key;
 if(!kd.match(/^[a-zA-Z_][a-zA-Z0-9_]*$/)){
-kd=arguments.callee(key,_bec);
+kd=arguments.callee(key,_bf9);
 }
-d+=kd+": "+arguments.callee(v[key],_bec);
+d+=kd+": "+arguments.callee(v[key],_bf9);
 }
 return d+"}";
 }
-if(_bec){
+if(_bf9){
 if(dojo.widget.html.stabile._recur){
-var _bf5=Object.prototype.toString;
-return _bf5.apply(v,[]);
+var _c02=Object.prototype.toString;
+return _c02.apply(v,[]);
 }else{
 dojo.widget.html.stabile._recur=true;
 return v.toString();
@@ -14262,7 +14308,7 @@ return "'unknown'";
 }
 }
 finally{
-dojo.widget.html.stabile._depth=_bed;
+dojo.widget.html.stabile._depth=_bfa;
 }
 };
 dojo.widget.html.stabile._getStorage=function(){
@@ -14273,45 +14319,45 @@ var form=document.forms._dojo_form;
 return dojo.widget.html.stabile.dataField=form?form.stabile:{value:""};
 };
 dojo.provide("dojo.widget.ComboBox");
-dojo.declare("dojo.widget.incrementalComboBoxDataProvider",null,function(_bf7){
-this.searchUrl=_bf7.dataUrl;
+dojo.declare("dojo.widget.incrementalComboBoxDataProvider",null,function(_c04){
+this.searchUrl=_c04.dataUrl;
 this._cache={};
 this._inFlight=false;
 this._lastRequest=null;
 this.allowCache=false;
-},{_addToCache:function(_bf8,data){
+},{_addToCache:function(_c05,data){
 if(this.allowCache){
-this._cache[_bf8]=data;
+this._cache[_c05]=data;
 }
-},startSearch:function(_bfa,_bfb){
+},startSearch:function(_c07,_c08){
 if(this._inFlight){
 }
-var tss=encodeURIComponent(_bfa);
-var _bfd=dojo.string.substituteParams(this.searchUrl,{"searchString":tss});
-var _bfe=this;
-var _bff=this._lastRequest=dojo.io.bind({url:_bfd,method:"get",mimetype:"text/json",load:function(type,data,evt){
-_bfe._inFlight=false;
+var tss=encodeURIComponent(_c07);
+var _c0a=dojo.string.substituteParams(this.searchUrl,{"searchString":tss});
+var _c0b=this;
+var _c0c=this._lastRequest=dojo.io.bind({url:_c0a,method:"get",mimetype:"text/json",load:function(type,data,evt){
+_c0b._inFlight=false;
 if(!dojo.lang.isArray(data)){
-var _c03=[];
+var _c10=[];
 for(var key in data){
-_c03.push([data[key],key]);
+_c10.push([data[key],key]);
 }
-data=_c03;
+data=_c10;
 }
-_bfe._addToCache(_bfa,data);
-if(_bff==_bfe._lastRequest){
-_bfb(data);
+_c0b._addToCache(_c07,data);
+if(_c0c==_c0b._lastRequest){
+_c08(data);
 }
 }});
 this._inFlight=true;
 }});
-dojo.declare("dojo.widget.basicComboBoxDataProvider",null,function(_c05,node){
+dojo.declare("dojo.widget.basicComboBoxDataProvider",null,function(_c12,node){
 this._data=[];
 this.searchLimit=30;
 this.searchType="STARTSTRING";
 this.caseSensitive=false;
-if(!dj_undef("dataUrl",_c05)&&!dojo.string.isBlank(_c05.dataUrl)){
-this._getData(_c05.dataUrl);
+if(!dj_undef("dataUrl",_c12)&&!dojo.string.isBlank(_c12.dataUrl)){
+this._getData(_c12.dataUrl);
 }else{
 if((node)&&(node.nodeName.toLowerCase()=="select")){
 var opts=node.getElementsByTagName("option");
@@ -14319,10 +14365,10 @@ var ol=opts.length;
 var data=[];
 for(var x=0;x<ol;x++){
 var text=opts[x].textContent||opts[x].innerText||opts[x].innerHTML;
-var _c0c=[String(text),String(opts[x].value)];
-data.push(_c0c);
+var _c19=[String(text),String(opts[x].value)];
+data.push(_c19);
 if(opts[x].selected){
-_c05.setAllValues(_c0c[0],_c0c[1]);
+_c12.setAllValues(_c19[0],_c19[1]);
 }
 }
 this.setData(data);
@@ -14331,57 +14377,57 @@ this.setData(data);
 },{_getData:function(url){
 dojo.io.bind({url:url,load:dojo.lang.hitch(this,function(type,data,evt){
 if(!dojo.lang.isArray(data)){
-var _c11=[];
+var _c1e=[];
 for(var key in data){
-_c11.push([data[key],key]);
+_c1e.push([data[key],key]);
 }
-data=_c11;
+data=_c1e;
 }
 this.setData(data);
 }),mimetype:"text/json"});
-},startSearch:function(_c13,_c14){
-this._performSearch(_c13,_c14);
-},_performSearch:function(_c15,_c16){
+},startSearch:function(_c20,_c21){
+this._performSearch(_c20,_c21);
+},_performSearch:function(_c22,_c23){
 var st=this.searchType;
 var ret=[];
 if(!this.caseSensitive){
-_c15=_c15.toLowerCase();
+_c22=_c22.toLowerCase();
 }
 for(var x=0;x<this._data.length;x++){
 if((this.searchLimit>0)&&(ret.length>=this.searchLimit)){
 break;
 }
-var _c1a=new String((!this.caseSensitive)?this._data[x][0].toLowerCase():this._data[x][0]);
-if(_c1a.length<_c15.length){
+var _c27=new String((!this.caseSensitive)?this._data[x][0].toLowerCase():this._data[x][0]);
+if(_c27.length<_c22.length){
 continue;
 }
 if(st=="STARTSTRING"){
-if(_c15==_c1a.substr(0,_c15.length)){
+if(_c22==_c27.substr(0,_c22.length)){
 ret.push(this._data[x]);
 }
 }else{
 if(st=="SUBSTRING"){
-if(_c1a.indexOf(_c15)>=0){
+if(_c27.indexOf(_c22)>=0){
 ret.push(this._data[x]);
 }
 }else{
 if(st=="STARTWORD"){
-var idx=_c1a.indexOf(_c15);
+var idx=_c27.indexOf(_c22);
 if(idx==0){
 ret.push(this._data[x]);
 }
 if(idx<=0){
 continue;
 }
-var _c1c=false;
+var _c29=false;
 while(idx!=-1){
-if(" ,/(".indexOf(_c1a.charAt(idx-1))!=-1){
-_c1c=true;
+if(" ,/(".indexOf(_c27.charAt(idx-1))!=-1){
+_c29=true;
 break;
 }
-idx=_c1a.indexOf(_c15,idx+1);
+idx=_c27.indexOf(_c22,idx+1);
 }
-if(!_c1c){
+if(!_c29){
 continue;
 }else{
 ret.push(this._data[x]);
@@ -14390,37 +14436,37 @@ ret.push(this._data[x]);
 }
 }
 }
-_c16(ret);
-},setData:function(_c1d){
-this._data=_c1d;
+_c23(ret);
+},setData:function(_c2a){
+this._data=_c2a;
 }});
-dojo.widget.defineWidget("dojo.widget.ComboBox",dojo.widget.HtmlWidget,{forceValidOption:false,searchType:"stringstart",dataProvider:null,autoComplete:true,searchDelay:100,dataUrl:"",fadeTime:200,maxListLength:8,mode:"local",selectedResult:null,dataProviderClass:"",buttonSrc:dojo.uri.moduleUri("dojo.widget","templates/images/combo_box_arrow.png"),dropdownToggle:"fade",templateString:"<span _=\"whitespace and CR's between tags adds &nbsp; in FF\"\n\tclass=\"dojoComboBoxOuter\"\n\t><input style=\"display:none\"  tabindex=\"-1\" name=\"\" value=\"\" \n\t\tdojoAttachPoint=\"comboBoxValue\"\n\t><input style=\"display:none\"  tabindex=\"-1\" name=\"\" value=\"\" \n\t\tdojoAttachPoint=\"comboBoxSelectionValue\"\n\t><input type=\"text\" autocomplete=\"off\" class=\"dojoComboBox\"\n\t\tdojoAttachEvent=\"key:_handleKeyEvents; keyUp: onKeyUp; compositionEnd; onResize;\"\n\t\tdojoAttachPoint=\"textInputNode\"\n\t><img hspace=\"0\"\n\t\tvspace=\"0\"\n\t\tclass=\"dojoComboBox\"\n\t\tdojoAttachPoint=\"downArrowNode\"\n\t\tdojoAttachEvent=\"onMouseUp: handleArrowClick; onResize;\"\n\t\tsrc=\"${this.buttonSrc}\"\n></span>\n",templateCssString:".dojoComboBoxOuter {\n\tborder: 0px !important;\n\tmargin: 0px !important;\n\tpadding: 0px !important;\n\tbackground: transparent !important;\n\twhite-space: nowrap !important;\n}\n\n.dojoComboBox {\n\tborder: 1px inset #afafaf;\n\tmargin: 0px;\n\tpadding: 0px;\n\tvertical-align: middle !important;\n\tfloat: none !important;\n\tposition: static !important;\n\tdisplay: inline !important;\n}\n\n/* the input box */\ninput.dojoComboBox {\n\tborder-right-width: 0px !important; \n\tmargin-right: 0px !important;\n\tpadding-right: 0px !important;\n}\n\n/* the down arrow */\nimg.dojoComboBox {\n\tborder-left-width: 0px !important;\n\tpadding-left: 0px !important;\n\tmargin-left: 0px !important;\n}\n\n/* IE vertical-alignment calculations can be off by +-1 but these margins are collapsed away */\n.dj_ie img.dojoComboBox {\n\tmargin-top: 1px; \n\tmargin-bottom: 1px; \n}\n\n/* the drop down */\n.dojoComboBoxOptions {\n\tfont-family: Verdana, Helvetica, Garamond, sans-serif;\n\t/* font-size: 0.7em; */\n\tbackground-color: white;\n\tborder: 1px solid #afafaf;\n\tposition: absolute;\n\tz-index: 1000; \n\toverflow: auto;\n\tcursor: default;\n}\n\n.dojoComboBoxItem {\n\tpadding-left: 2px;\n\tpadding-top: 2px;\n\tmargin: 0px;\n}\n\n.dojoComboBoxItemEven {\n\tbackground-color: #f4f4f4;\n}\n\n.dojoComboBoxItemOdd {\n\tbackground-color: white;\n}\n\n.dojoComboBoxItemHighlight {\n\tbackground-color: #63709A;\n\tcolor: white;\n}\n",templateCssPath:dojo.uri.moduleUri("dojo.widget","templates/ComboBox.css"),setValue:function(_c1e){
-this.comboBoxValue.value=_c1e;
-if(this.textInputNode.value!=_c1e){
-this.textInputNode.value=_c1e;
+dojo.widget.defineWidget("dojo.widget.ComboBox",dojo.widget.HtmlWidget,{forceValidOption:false,searchType:"stringstart",dataProvider:null,autoComplete:true,searchDelay:100,dataUrl:"",fadeTime:200,maxListLength:8,mode:"local",selectedResult:null,dataProviderClass:"",buttonSrc:dojo.uri.moduleUri("dojo.widget","templates/images/combo_box_arrow.png"),dropdownToggle:"fade",templateString:"<span _=\"whitespace and CR's between tags adds &nbsp; in FF\"\n\tclass=\"dojoComboBoxOuter\"\n\t><input style=\"display:none\"  tabindex=\"-1\" name=\"\" value=\"\" \n\t\tdojoAttachPoint=\"comboBoxValue\"\n\t><input style=\"display:none\"  tabindex=\"-1\" name=\"\" value=\"\" \n\t\tdojoAttachPoint=\"comboBoxSelectionValue\"\n\t><input type=\"text\" autocomplete=\"off\" class=\"dojoComboBox\"\n\t\tdojoAttachEvent=\"key:_handleKeyEvents; keyUp: onKeyUp; compositionEnd; onResize;\"\n\t\tdojoAttachPoint=\"textInputNode\"\n\t><img hspace=\"0\"\n\t\tvspace=\"0\"\n\t\tclass=\"dojoComboBox\"\n\t\tdojoAttachPoint=\"downArrowNode\"\n\t\tdojoAttachEvent=\"onMouseUp: handleArrowClick; onResize;\"\n\t\tsrc=\"${this.buttonSrc}\"\n></span>\n",templateCssString:".dojoComboBoxOuter {\n\tborder: 0px !important;\n\tmargin: 0px !important;\n\tpadding: 0px !important;\n\tbackground: transparent !important;\n\twhite-space: nowrap !important;\n}\n\n.dojoComboBox {\n\tborder: 1px inset #afafaf;\n\tmargin: 0px;\n\tpadding: 0px;\n\tvertical-align: middle !important;\n\tfloat: none !important;\n\tposition: static !important;\n\tdisplay: inline !important;\n}\n\n/* the input box */\ninput.dojoComboBox {\n\tborder-right-width: 0px !important; \n\tmargin-right: 0px !important;\n\tpadding-right: 0px !important;\n}\n\n/* the down arrow */\nimg.dojoComboBox {\n\tborder-left-width: 0px !important;\n\tpadding-left: 0px !important;\n\tmargin-left: 0px !important;\n}\n\n/* IE vertical-alignment calculations can be off by +-1 but these margins are collapsed away */\n.dj_ie img.dojoComboBox {\n\tmargin-top: 1px; \n\tmargin-bottom: 1px; \n}\n\n/* the drop down */\n.dojoComboBoxOptions {\n\tfont-family: Verdana, Helvetica, Garamond, sans-serif;\n\t/* font-size: 0.7em; */\n\tbackground-color: white;\n\tborder: 1px solid #afafaf;\n\tposition: absolute;\n\tz-index: 1000; \n\toverflow: auto;\n\tcursor: default;\n}\n\n.dojoComboBoxItem {\n\tpadding-left: 2px;\n\tpadding-top: 2px;\n\tmargin: 0px;\n}\n\n.dojoComboBoxItemEven {\n\tbackground-color: #f4f4f4;\n}\n\n.dojoComboBoxItemOdd {\n\tbackground-color: white;\n}\n\n.dojoComboBoxItemHighlight {\n\tbackground-color: #63709A;\n\tcolor: white;\n}\n",templateCssPath:dojo.uri.moduleUri("dojo.widget","templates/ComboBox.css"),setValue:function(_c2b){
+this.comboBoxValue.value=_c2b;
+if(this.textInputNode.value!=_c2b){
+this.textInputNode.value=_c2b;
 dojo.widget.html.stabile.setState(this.widgetId,this.getState(),true);
-this.onValueChanged(_c1e);
+this.onValueChanged(_c2b);
 }
-},onValueChanged:function(_c1f){
+},onValueChanged:function(_c2c){
 },getValue:function(){
 return this.comboBoxValue.value;
 },getState:function(){
 return {value:this.getValue()};
-},setState:function(_c20){
-this.setValue(_c20.value);
+},setState:function(_c2d){
+this.setValue(_c2d.value);
 },enable:function(){
 this.disabled=false;
 this.textInputNode.removeAttribute("disabled");
 },disable:function(){
 this.disabled=true;
 this.textInputNode.setAttribute("disabled",true);
-},_getCaretPos:function(_c21){
-if(dojo.lang.isNumber(_c21.selectionStart)){
-return _c21.selectionStart;
+},_getCaretPos:function(_c2e){
+if(dojo.lang.isNumber(_c2e.selectionStart)){
+return _c2e.selectionStart;
 }else{
 if(dojo.render.html.ie){
 var tr=document.selection.createRange().duplicate();
-var ntr=_c21.createTextRange();
+var ntr=_c2e.createTextRange();
 tr.move("character",0);
 ntr.move("character",0);
 try{
@@ -14432,36 +14478,36 @@ return 0;
 }
 }
 }
-},_setCaretPos:function(_c24,_c25){
-_c25=parseInt(_c25);
-this._setSelectedRange(_c24,_c25,_c25);
-},_setSelectedRange:function(_c26,_c27,end){
+},_setCaretPos:function(_c31,_c32){
+_c32=parseInt(_c32);
+this._setSelectedRange(_c31,_c32,_c32);
+},_setSelectedRange:function(_c33,_c34,end){
 if(!end){
-end=_c26.value.length;
+end=_c33.value.length;
 }
-if(_c26.setSelectionRange){
-_c26.focus();
-_c26.setSelectionRange(_c27,end);
+if(_c33.setSelectionRange){
+_c33.focus();
+_c33.setSelectionRange(_c34,end);
 }else{
-if(_c26.createTextRange){
-var _c29=_c26.createTextRange();
-with(_c29){
+if(_c33.createTextRange){
+var _c36=_c33.createTextRange();
+with(_c36){
 collapse(true);
 moveEnd("character",end);
-moveStart("character",_c27);
+moveStart("character",_c34);
 select();
 }
 }else{
-_c26.value=_c26.value;
-_c26.blur();
-_c26.focus();
-var dist=parseInt(_c26.value.length)-end;
-var _c2b=String.fromCharCode(37);
-var tcc=_c2b.charCodeAt(0);
+_c33.value=_c33.value;
+_c33.blur();
+_c33.focus();
+var dist=parseInt(_c33.value.length)-end;
+var _c38=String.fromCharCode(37);
+var tcc=_c38.charCodeAt(0);
 for(var x=0;x<dist;x++){
 var te=document.createEvent("KeyEvents");
 te.initKeyEvent("keypress",true,true,null,false,false,false,false,tcc,tcc);
-_c26.dispatchEvent(te);
+_c33.dispatchEvent(te);
 }
 }
 }
@@ -14472,7 +14518,7 @@ return;
 this._prev_key_backspace=false;
 this._prev_key_esc=false;
 var k=dojo.event.browser.keys;
-var _c31=true;
+var _c3e=true;
 switch(evt.key){
 case k.KEY_DOWN_ARROW:
 if(!this.popupWidget.isShowingNow){
@@ -14520,22 +14566,22 @@ this._prev_key_backspace=true;
 if(!this.textInputNode.value.length){
 this.setAllValues("","");
 this._hideResultList();
-_c31=false;
+_c3e=false;
 }
 break;
 case k.KEY_RIGHT_ARROW:
 case k.KEY_LEFT_ARROW:
-_c31=false;
+_c3e=false;
 break;
 default:
 if(evt.charCode==0){
-_c31=false;
+_c3e=false;
 }
 }
 if(this.searchTimer){
 clearTimeout(this.searchTimer);
 }
-if(_c31){
+if(_c3e){
 this._blurOptionNode();
 this.searchTimer=setTimeout(dojo.lang.hitch(this,this._startSearchFromInput),this.searchDelay);
 }
@@ -14544,11 +14590,11 @@ evt.key=evt.keyCode;
 this._handleKeyEvents(evt);
 },onKeyUp:function(evt){
 this.setValue(this.textInputNode.value);
-},setSelectedValue:function(_c34){
-this.comboBoxSelectionValue.value=_c34;
-},setAllValues:function(_c35,_c36){
-this.setSelectedValue(_c36);
-this.setValue(_c35);
+},setSelectedValue:function(_c41){
+this.comboBoxSelectionValue.value=_c41;
+},setAllValues:function(_c42,_c43){
+this.setSelectedValue(_c43);
+this.setValue(_c42);
 },_focusOptionNode:function(node){
 if(this._highlighted_option!=node){
 this._blurOptionNode();
@@ -14590,43 +14636,43 @@ return;
 }
 this._blurOptionNode();
 },onResize:function(){
-var _c3a=dojo.html.getContentBox(this.textInputNode);
-if(_c3a.height<=0){
+var _c47=dojo.html.getContentBox(this.textInputNode);
+if(_c47.height<=0){
 dojo.lang.setTimeout(this,"onResize",100);
 return;
 }
-var _c3b={width:_c3a.height,height:_c3a.height};
-dojo.html.setContentBox(this.downArrowNode,_c3b);
+var _c48={width:_c47.height,height:_c47.height};
+dojo.html.setContentBox(this.downArrowNode,_c48);
 },fillInTemplate:function(args,frag){
 dojo.html.applyBrowserClass(this.domNode);
-var _c3e=this.getFragNodeRef(frag);
-if(!this.name&&_c3e.name){
-this.name=_c3e.name;
+var _c4b=this.getFragNodeRef(frag);
+if(!this.name&&_c4b.name){
+this.name=_c4b.name;
 }
 this.comboBoxValue.name=this.name;
 this.comboBoxSelectionValue.name=this.name+"_selected";
-dojo.html.copyStyle(this.domNode,_c3e);
-dojo.html.copyStyle(this.textInputNode,_c3e);
-dojo.html.copyStyle(this.downArrowNode,_c3e);
+dojo.html.copyStyle(this.domNode,_c4b);
+dojo.html.copyStyle(this.textInputNode,_c4b);
+dojo.html.copyStyle(this.downArrowNode,_c4b);
 with(this.downArrowNode.style){
 width="0px";
 height="0px";
 }
-var _c3f;
+var _c4c;
 if(this.dataProviderClass){
 if(typeof this.dataProviderClass=="string"){
-_c3f=dojo.evalObjPath(this.dataProviderClass);
+_c4c=dojo.evalObjPath(this.dataProviderClass);
 }else{
-_c3f=this.dataProviderClass;
+_c4c=this.dataProviderClass;
 }
 }else{
 if(this.mode=="remote"){
-_c3f=dojo.widget.incrementalComboBoxDataProvider;
+_c4c=dojo.widget.incrementalComboBoxDataProvider;
 }else{
-_c3f=dojo.widget.basicComboBoxDataProvider;
+_c4c=dojo.widget.basicComboBoxDataProvider;
 }
 }
-this.dataProvider=new _c3f(this,this.getFragNodeRef(frag));
+this.dataProvider=new _c4c(this,this.getFragNodeRef(frag));
 this.popupWidget=new dojo.widget.createWidget("PopupContainer",{toggle:this.dropdownToggle,toggleDuration:this.toggleDuration});
 dojo.event.connect(this,"destroy",this.popupWidget,"destroy");
 this.optionsListNode=this.popupWidget.domNode;
@@ -14637,24 +14683,24 @@ dojo.event.connect(this.optionsListNode,"onmouseover",this,"_onMouseOver");
 dojo.event.connect(this.optionsListNode,"onmouseout",this,"_onMouseOut");
 dojo.event.connect(this.optionsListNode,"onmouseover",this,"_itemMouseOver");
 dojo.event.connect(this.optionsListNode,"onmouseout",this,"_itemMouseOut");
-},_openResultList:function(_c40){
+},_openResultList:function(_c4d){
 if(this.disabled){
 return;
 }
 this._clearResultList();
-if(!_c40.length){
+if(!_c4d.length){
 this._hideResultList();
 }
-if((this.autoComplete)&&(_c40.length)&&(!this._prev_key_backspace)&&(this.textInputNode.value.length>0)){
+if((this.autoComplete)&&(_c4d.length)&&(!this._prev_key_backspace)&&(this.textInputNode.value.length>0)){
 var cpos=this._getCaretPos(this.textInputNode);
 if((cpos+1)>this.textInputNode.value.length){
-this.textInputNode.value+=_c40[0][0].substr(cpos);
+this.textInputNode.value+=_c4d[0][0].substr(cpos);
 this._setSelectedRange(this.textInputNode,cpos,this.textInputNode.value.length);
 }
 }
 var even=true;
-while(_c40.length){
-var tr=_c40.shift();
+while(_c4d.length){
+var tr=_c4d.shift();
 if(tr){
 var td=document.createElement("div");
 td.appendChild(document.createTextNode(tr[0]));
@@ -14671,12 +14717,12 @@ this._hasFocus=true;
 },_onBlurInput:function(){
 this._hasFocus=false;
 this._handleBlurTimer(true,500);
-},_handleBlurTimer:function(_c45,_c46){
-if(this.blurTimer&&(_c45||_c46)){
+},_handleBlurTimer:function(_c52,_c53){
+if(this.blurTimer&&(_c52||_c53)){
 clearTimeout(this.blurTimer);
 }
-if(_c46){
-this.blurTimer=dojo.lang.setTimeout(this,"_checkBlurred",_c46);
+if(_c53){
+this.blurTimer=dojo.lang.setTimeout(this,"_checkBlurred",_c53);
 }
 },_onMouseOver:function(evt){
 if(!this._mouseover_list){
@@ -14684,9 +14730,9 @@ this._handleBlurTimer(true,0);
 this._mouseover_list=true;
 }
 },_onMouseOut:function(evt){
-var _c49=evt.relatedTarget;
+var _c56=evt.relatedTarget;
 try{
-if(!_c49||_c49.parentNode!=this.optionsListNode){
+if(!_c56||_c56.parentNode!=this.optionsListNode){
 this._mouseover_list=false;
 this._handleBlurTimer(true,100);
 this._tryFocus();
@@ -14694,24 +14740,24 @@ this._tryFocus();
 }
 catch(e){
 }
-},_isInputEqualToResult:function(_c4a){
-var _c4b=this.textInputNode.value;
+},_isInputEqualToResult:function(_c57){
+var _c58=this.textInputNode.value;
 if(!this.dataProvider.caseSensitive){
-_c4b=_c4b.toLowerCase();
-_c4a=_c4a.toLowerCase();
+_c58=_c58.toLowerCase();
+_c57=_c57.toLowerCase();
 }
-return (_c4b==_c4a);
+return (_c58==_c57);
 },_isValidOption:function(){
 var tgt=dojo.html.firstElement(this.optionsListNode);
-var _c4d=false;
-while(!_c4d&&tgt){
+var _c5a=false;
+while(!_c5a&&tgt){
 if(this._isInputEqualToResult(tgt.getAttribute("resultName"))){
-_c4d=true;
+_c5a=true;
 }else{
 tgt=dojo.html.nextElement(tgt);
 }
 }
-return _c4d;
+return _c5a;
 },_checkBlurred:function(){
 if(!this._hasFocus&&!this._mouseover_list){
 this._hideResultList();
@@ -14719,12 +14765,12 @@ if(!this.textInputNode.value.length){
 this.setAllValues("","");
 return;
 }
-var _c4e=this._isValidOption();
-if(this.forceValidOption&&!_c4e){
+var _c5b=this._isValidOption();
+if(this.forceValidOption&&!_c5b){
 this.setAllValues("","");
 return;
 }
-if(!_c4e){
+if(!_c5b){
 this.setSelectedValue("");
 }
 }
@@ -14764,15 +14810,15 @@ this.optionsListNode.innerHTML="";
 },_hideResultList:function(){
 this.popupWidget.close();
 },_showResultList:function(){
-var _c51=this.optionsListNode.childNodes;
-if(_c51.length){
-var _c52=Math.min(_c51.length,this.maxListLength);
+var _c5e=this.optionsListNode.childNodes;
+if(_c5e.length){
+var _c5f=Math.min(_c5e.length,this.maxListLength);
 with(this.optionsListNode.style){
 display="";
-if(_c52==_c51.length){
+if(_c5f==_c5e.length){
 height="";
 }else{
-height=_c52*dojo.html.getMarginBox(_c51[0]).height+"px";
+height=_c5f*dojo.html.getMarginBox(_c5e[0]).height+"px";
 }
 width=(dojo.html.getMarginBox(this.domNode).width-2)+"px";
 }
@@ -14811,15 +14857,15 @@ this.setState(s);
 }
 }});
 dojo.provide("struts.widget.ComboBox");
-struts.widget.ComboBoxDataProvider=function(_c55,node){
+struts.widget.ComboBoxDataProvider=function(_c62,node){
 this.data=[];
-this.searchLimit=_c55.searchLimit;
+this.searchLimit=_c62.searchLimit;
 this.searchType="STARTSTRING";
 this.caseSensitive=false;
 this._lastSearch="";
 this._lastSearchResults=null;
 this.firstRequest=true;
-this.cbox=_c55;
+this.cbox=_c62;
 this.formId=this.cbox.formId;
 this.formFilter=this.cbox.formFilter;
 this.getData=function(url){
@@ -14830,50 +14876,50 @@ if(!this.firstRequest){
 this.firstRequest=false;
 this.cbox.notify.apply(this.cbox,[data,type,evt]);
 }
-var _c5b=null;
-var _c5c=data[this.cbox.dataFieldName];
+var _c68=null;
+var _c69=data[this.cbox.dataFieldName];
 if(!dojo.lang.isArray(data)){
-if(_c5c){
-if(dojo.lang.isArray(_c5c)){
-_c5b=_c5c;
+if(_c69){
+if(dojo.lang.isArray(_c69)){
+_c68=_c69;
 }else{
-if(dojo.lang.isObject(_c5c)){
-_c5b=[];
-for(var key in _c5c){
-_c5b.push([_c5c[key],key]);
+if(dojo.lang.isObject(_c69)){
+_c68=[];
+for(var key in _c69){
+_c68.push([_c69[key],key]);
 }
 }
 }
 }else{
-var _c5e=[];
+var _c6b=[];
 for(var key in data){
 if(dojo.string.startsWith(key,this.cbox.name)){
-_c5b=data[key];
+_c68=data[key];
 break;
 }else{
-_c5e.push([data[key],key]);
+_c6b.push([data[key],key]);
 }
-if(!_c5b&&dojo.lang.isArray(data[key])&&!dojo.lang.isString(data[key])){
-_c5b=data[key];
+if(!_c68&&dojo.lang.isArray(data[key])&&!dojo.lang.isString(data[key])){
+_c68=data[key];
 }
 }
-if(!_c5b){
-_c5b=_c5e;
+if(!_c68){
+_c68=_c6b;
 }
 }
-data=_c5b;
+data=_c68;
 }
 this.setData(data);
 }),mimetype:"text/json"});
 };
-this.startSearch=function(_c5f,_c60){
-this._preformSearch(_c5f,_c60);
+this.startSearch=function(_c6c,_c6d){
+this._preformSearch(_c6c,_c6d);
 };
-this._preformSearch=function(_c61,_c62){
+this._preformSearch=function(_c6e,_c6f){
 var st=this.searchType;
 var ret=[];
 if(!this.caseSensitive){
-_c61=_c61.toLowerCase();
+_c6e=_c6e.toLowerCase();
 }
 for(var x=0;x<this.data.length;x++){
 if(!this.data[x]){
@@ -14882,37 +14928,37 @@ continue;
 if((this.searchLimit>0)&&(ret.length>=this.searchLimit)){
 break;
 }
-var _c66=new String((!this.caseSensitive)?this.data[x][0].toLowerCase():this.data[x][0]);
-if(_c66.length<_c61.length){
+var _c73=new String((!this.caseSensitive)?this.data[x][0].toLowerCase():this.data[x][0]);
+if(_c73.length<_c6e.length){
 continue;
 }
 if(st=="STARTSTRING"){
-if(_c61==_c66.substr(0,_c61.length)){
+if(_c6e==_c73.substr(0,_c6e.length)){
 ret.push(this.data[x]);
 }
 }else{
 if(st=="SUBSTRING"){
-if(_c66.indexOf(_c61)>=0){
+if(_c73.indexOf(_c6e)>=0){
 ret.push(this.data[x]);
 }
 }else{
 if(st=="STARTWORD"){
-var idx=_c66.indexOf(_c61);
+var idx=_c73.indexOf(_c6e);
 if(idx==0){
 ret.push(this.data[x]);
 }
 if(idx<=0){
 continue;
 }
-var _c68=false;
+var _c75=false;
 while(idx!=-1){
-if(" ,/(".indexOf(_c66.charAt(idx-1))!=-1){
-_c68=true;
+if(" ,/(".indexOf(_c73.charAt(idx-1))!=-1){
+_c75=true;
 break;
 }
-idx=_c66.indexOf(_c61,idx+1);
+idx=_c73.indexOf(_c6e,idx+1);
 }
-if(!_c68){
+if(!_c75){
 continue;
 }else{
 ret.push(this.data[x]);
@@ -14921,17 +14967,17 @@ ret.push(this.data[x]);
 }
 }
 }
-_c62(ret);
+_c6f(ret);
 };
-this.addData=function(_c69){
-this.data=this.data.concat(_c69);
+this.addData=function(_c76){
+this.data=this.data.concat(_c76);
 };
-this.setData=function(_c6a){
-this.data=_c6a;
+this.setData=function(_c77){
+this.data=_c77;
 for(var i=0;i<this.data.length;i++){
-var _c6c=this.data[i];
-if(!dojo.lang.isArray(_c6c)){
-this.data[i]=[_c6c,_c6c];
+var _c79=this.data[i];
+if(!dojo.lang.isArray(_c79)){
+this.data[i]=[_c79,_c79];
 }
 }
 };
@@ -14944,10 +14990,10 @@ var ol=opts.length;
 var data=[];
 for(var x=0;x<ol;x++){
 var text=opts[x].textContent||opts[x].innerText||opts[x].innerHTML;
-var _c72=[String(text),String(opts[x].value)];
-data.push(_c72);
+var _c7f=[String(text),String(opts[x].value)];
+data.push(_c7f);
 if(opts[x].selected){
-this.cbox.setAllValues(_c72[0],_c72[1]);
+this.cbox.setAllValues(_c7f[0],_c7f[1]);
 }
 }
 this.setData(data);
@@ -14955,55 +15001,55 @@ this.setData(data);
 }
 };
 dojo.widget.defineWidget("struts.widget.ComboBox",dojo.widget.ComboBox,{widgetType:"ComboBox",dropdownHeight:120,dropdownWidth:0,itemHeight:0,listenTopics:"",notifyTopics:"",notifyTopicsArray:null,beforeNotifyTopics:"",beforeNotifyTopicsArray:null,afterNotifyTopics:"",afterNotifyTopicsArray:null,errorNotifyTopics:"",errorNotifyTopicsArray:null,valueNotifyTopics:"",valueNotifyTopicsArray:null,indicator:"",formId:"",formFilter:"",dataProviderClass:"struts.widget.ComboBoxDataProvider",loadOnType:false,loadMinimum:3,initialValue:"",initialKey:"",visibleDownArrow:true,fadeTime:100,searchType:"STARTSTRING",dataFieldName:"",keyName:"",templateCssString:null,templateCssString:".dojoComboBoxOuter {\n\tborder: 0px !important;\n\tmargin: 0px !important;\n\tpadding: 0px !important;\n\tbackground: transparent !important;\n\twhite-space: nowrap !important;\n}\n\n.dojoComboBox {\n\tborder: 1px inset #afafaf;\n\tmargin: 0px;\n\tpadding: 0px;\n\tvertical-align: middle !important;\n\tfloat: none !important;\n\tposition: static !important;\n\tdisplay: inline;\n}\n\n/* the input box */\ninput.dojoComboBox {\n\tborder-right-width: 1px !important;\n\tmargin-right: 0px !important;\n\tpadding-right: 0px !important;\n}\n\n/* the down arrow */\nimg.dojoComboBox {\n\tborder-left-width: 0px !important;\n\tpadding-left: 0px !important;\n\tmargin-left: 0px !important;\n}\n\n/* IE vertical-alignment calculations can be off by +-1 but these margins are collapsed away */\n.dj_ie img.dojoComboBox {\n\tmargin-top: 1px;\n\tmargin-bottom: 1px;\n}\n\n/* the drop down */\n.dojoComboBoxOptions {\n\tfont-family: Verdana, Helvetica, Garamond, sans-serif;\n\t/* font-size: 0.7em; */\n\tbackground-color: white;\n\tborder: 1px solid #afafaf;\n\tposition: absolute;\n\tz-index: 1000;\n\toverflow: auto;\n\tcursor: default;\n}\n\n.dojoComboBoxItem {\n\tpadding-left: 2px;\n\tpadding-top: 2px;\n\tmargin: 0px;\n}\n\n.dojoComboBoxItemEven {\n\tbackground-color: #f4f4f4;\n}\n\n.dojoComboBoxItemOdd {\n\tbackground-color: white;\n}\n\n.dojoComboBoxItemHighlight {\n\tbackground-color: #63709A;\n\tcolor: white;\n}\n",templateCssPath:dojo.uri.dojoUri("struts/ComboBox.css"),searchLimit:30,showResultList:function(){
-var _c73=this.optionsListNode.childNodes;
-if(_c73.length){
+var _c80=this.optionsListNode.childNodes;
+if(_c80.length){
 this.optionsListNode.style.width=this.dropdownWidth===0?(dojo.html.getMarginBox(this.domNode).width-2)+"px":this.dropdownWidth+"px";
 if(this.itemHeight===0||dojo.string.isBlank(this.textInputNode.value)){
 this.optionsListNode.style.height=this.dropdownHeight+"px";
 this.optionsListNode.style.display="";
-this.itemHeight=dojo.html.getMarginBox(_c73[0]).height;
+this.itemHeight=dojo.html.getMarginBox(_c80[0]).height;
 }
-var _c74=this.itemHeight*_c73.length;
-if(_c74<this.dropdownHeight){
-this.optionsListNode.style.height=_c74+2+"px";
+var _c81=this.itemHeight*_c80.length;
+if(_c81<this.dropdownHeight){
+this.optionsListNode.style.height=_c81+2+"px";
 }
 this.popupWidget.open(this.domNode,this,this.downArrowNode);
 }else{
 this._hideResultList();
 }
-},_openResultList:function(_c75){
+},_openResultList:function(_c82){
 if(this.disabled){
 return;
 }
 this._clearResultList();
-if(!_c75.length){
+if(!_c82.length){
 this._hideResultList();
 }
-if((this.autoComplete)&&(_c75.length)&&(!this._prev_key_backspace)&&(this.textInputNode.value.length>0)){
+if((this.autoComplete)&&(_c82.length)&&(!this._prev_key_backspace)&&(this.textInputNode.value.length>0)){
 var cpos=this._getCaretPos(this.textInputNode);
 if((cpos+1)>this.textInputNode.value.length){
-this.textInputNode.value+=_c75[0][0].substr(cpos);
+this.textInputNode.value+=_c82[0][0].substr(cpos);
 this._setSelectedRange(this.textInputNode,cpos,this.textInputNode.value.length);
 }
 }
-var _c77=this.textInputNode.value;
+var _c84=this.textInputNode.value;
 var even=true;
-while(_c75.length){
-var tr=_c75.shift();
+while(_c82.length){
+var tr=_c82.shift();
 if(tr){
 var td=document.createElement("div");
 var text=tr[0];
-var i=text.toLowerCase().indexOf(_c77.toLowerCase());
+var i=text.toLowerCase().indexOf(_c84.toLowerCase());
 if(i>=0){
 var pre=text.substring(0,i);
-var _c7e=text.substring(i,i+_c77.length);
-var post=text.substring(i+_c77.length);
+var _c8b=text.substring(i,i+_c84.length);
+var post=text.substring(i+_c84.length);
 if(!dojo.string.isBlank(pre)){
 td.appendChild(document.createTextNode(pre));
 }
-var _c80=document.createElement("b");
-td.appendChild(_c80);
-_c80.appendChild(document.createTextNode(_c7e));
+var _c8d=document.createElement("b");
+td.appendChild(_c8d);
+_c8d.appendChild(document.createTextNode(_c8b));
 td.appendChild(document.createTextNode(post));
 }else{
 td.appendChild(document.createTextNode(tr[0]));
@@ -15020,12 +15066,12 @@ this.showResultList();
 struts.widget.ComboBox.superclass.postCreate.apply(this);
 var self=this;
 if(!dojo.string.isBlank(this.listenTopics)){
-var _c82=this.listenTopics.split(",");
-for(var i=0;i<_c82.length;i++){
-dojo.event.topic.subscribe(_c82[i],function(){
-var _c84={cancel:false};
-self.notify(this.widgetId,"before",_c84);
-if(_c84.cancel){
+var _c8f=this.listenTopics.split(",");
+for(var i=0;i<_c8f.length;i++){
+dojo.event.topic.subscribe(_c8f[i],function(){
+var _c91={cancel:false};
+self.notify(this.widgetId,"before",_c91);
+if(_c91.cancel){
 return;
 }
 self.clearValues();
@@ -15067,37 +15113,37 @@ this.notify(data,"valuechanged",null);
 },notify:function(data,type,e){
 if(this.notifyTopicsArray){
 var self=this;
-dojo.lang.forEach(this.notifyTopicsArray,function(_c8a){
+dojo.lang.forEach(this.notifyTopicsArray,function(_c97){
 try{
-dojo.event.topic.publish(_c8a,data,type,e);
+dojo.event.topic.publish(_c97,data,type,e);
 }
 catch(ex){
 self.log(ex);
 }
 });
 }
-var _c8b=null;
+var _c98=null;
 switch(type){
 case "before":
-_c8b=this.beforeNotifyTopicsArray;
+_c98=this.beforeNotifyTopicsArray;
 break;
 case "load":
-_c8b=this.afterNotifyTopicsArray;
+_c98=this.afterNotifyTopicsArray;
 break;
 case "error":
-_c8b=this.errorNotifyTopicsArray;
+_c98=this.errorNotifyTopicsArray;
 break;
 case "valuechanged":
-_c8b=this.valueNotifyTopicsArray;
+_c98=this.valueNotifyTopicsArray;
 break;
 }
-this.notifyTo(_c8b,data,type,e);
-},notifyTo:function(_c8c,data,type,e){
+this.notifyTo(_c98,data,type,e);
+},notifyTo:function(_c99,data,type,e){
 var self=this;
-if(_c8c){
-dojo.lang.forEach(_c8c,function(_c91){
+if(_c99){
+dojo.lang.forEach(_c99,function(_c9e){
 try{
-dojo.event.topic.publish(_c91,data,type,e);
+dojo.event.topic.publish(_c9e,data,type,e);
 }
 catch(ex){
 self.log(ex);
@@ -15107,18 +15153,18 @@ self.log(ex);
 },log:function(text){
 dojo.debug("["+(this.widgetId?this.widgetId:"unknown")+"] "+text);
 },_startSearchFromInput:function(){
-var _c93=this.textInputNode.value;
+var _ca0=this.textInputNode.value;
 if(this.loadOnType){
-if(_c93.length>=this.loadMinimum){
-var _c94=this.dataUrl+(this.dataUrl.indexOf("?")>-1?"&":"?");
-_c94+=this.name+"="+_c93;
-this.dataProvider.getData(_c94);
-this._startSearch(_c93);
+if(_ca0.length>=this.loadMinimum){
+var _ca1=this.dataUrl+(this.dataUrl.indexOf("?")>-1?"&":"?");
+_ca1+=this.name+"="+_ca0;
+this.dataProvider.getData(_ca1);
+this._startSearch(_ca0);
 }else{
 this._hideResultList();
 }
 }else{
-this._startSearch(_c93);
+this._startSearch(_ca0);
 }
 }});
 dojo.provide("dojo.widget.DropdownContainer");
@@ -15166,197 +15212,197 @@ this.inputNode.disabled=true;
 dojo.widget.DropdownContainer.superclass.disable.apply(this,arguments);
 }});
 dojo.provide("dojo.date.serialize");
-dojo.date.setIso8601=function(_c98,_c99){
-var _c9a=(_c99.indexOf("T")==-1)?_c99.split(" "):_c99.split("T");
-_c98=dojo.date.setIso8601Date(_c98,_c9a[0]);
-if(_c9a.length==2){
-_c98=dojo.date.setIso8601Time(_c98,_c9a[1]);
+dojo.date.setIso8601=function(_ca5,_ca6){
+var _ca7=(_ca6.indexOf("T")==-1)?_ca6.split(" "):_ca6.split("T");
+_ca5=dojo.date.setIso8601Date(_ca5,_ca7[0]);
+if(_ca7.length==2){
+_ca5=dojo.date.setIso8601Time(_ca5,_ca7[1]);
 }
-return _c98;
+return _ca5;
 };
-dojo.date.fromIso8601=function(_c9b){
-return dojo.date.setIso8601(new Date(0,0),_c9b);
+dojo.date.fromIso8601=function(_ca8){
+return dojo.date.setIso8601(new Date(0,0),_ca8);
 };
-dojo.date.setIso8601Date=function(_c9c,_c9d){
-var _c9e="^([0-9]{4})((-?([0-9]{2})(-?([0-9]{2}))?)|"+"(-?([0-9]{3}))|(-?W([0-9]{2})(-?([1-7]))?))?$";
-var d=_c9d.match(new RegExp(_c9e));
+dojo.date.setIso8601Date=function(_ca9,_caa){
+var _cab="^([0-9]{4})((-?([0-9]{2})(-?([0-9]{2}))?)|"+"(-?([0-9]{3}))|(-?W([0-9]{2})(-?([1-7]))?))?$";
+var d=_caa.match(new RegExp(_cab));
 if(!d){
-dojo.debug("invalid date string: "+_c9d);
+dojo.debug("invalid date string: "+_caa);
 return null;
 }
 var year=d[1];
-var _ca1=d[4];
+var _cae=d[4];
 var date=d[6];
-var _ca3=d[8];
+var _cb0=d[8];
 var week=d[10];
-var _ca5=d[12]?d[12]:1;
-_c9c.setFullYear(year);
-if(_ca3){
-_c9c.setMonth(0);
-_c9c.setDate(Number(_ca3));
+var _cb2=d[12]?d[12]:1;
+_ca9.setFullYear(year);
+if(_cb0){
+_ca9.setMonth(0);
+_ca9.setDate(Number(_cb0));
 }else{
 if(week){
-_c9c.setMonth(0);
-_c9c.setDate(1);
-var gd=_c9c.getDay();
+_ca9.setMonth(0);
+_ca9.setDate(1);
+var gd=_ca9.getDay();
 var day=gd?gd:7;
-var _ca8=Number(_ca5)+(7*Number(week));
+var _cb5=Number(_cb2)+(7*Number(week));
 if(day<=4){
-_c9c.setDate(_ca8+1-day);
+_ca9.setDate(_cb5+1-day);
 }else{
-_c9c.setDate(_ca8+8-day);
+_ca9.setDate(_cb5+8-day);
 }
 }else{
-if(_ca1){
-_c9c.setDate(1);
-_c9c.setMonth(_ca1-1);
+if(_cae){
+_ca9.setDate(1);
+_ca9.setMonth(_cae-1);
 }
 if(date){
-_c9c.setDate(date);
+_ca9.setDate(date);
 }
 }
 }
-return _c9c;
+return _ca9;
 };
-dojo.date.fromIso8601Date=function(_ca9){
-return dojo.date.setIso8601Date(new Date(0,0),_ca9);
+dojo.date.fromIso8601Date=function(_cb6){
+return dojo.date.setIso8601Date(new Date(0,0),_cb6);
 };
-dojo.date.setIso8601Time=function(_caa,_cab){
-var _cac="Z|(([-+])([0-9]{2})(:?([0-9]{2}))?)$";
-var d=_cab.match(new RegExp(_cac));
-var _cae=0;
+dojo.date.setIso8601Time=function(_cb7,_cb8){
+var _cb9="Z|(([-+])([0-9]{2})(:?([0-9]{2}))?)$";
+var d=_cb8.match(new RegExp(_cb9));
+var _cbb=0;
 if(d){
 if(d[0]!="Z"){
-_cae=(Number(d[3])*60)+Number(d[5]);
-_cae*=((d[2]=="-")?1:-1);
+_cbb=(Number(d[3])*60)+Number(d[5]);
+_cbb*=((d[2]=="-")?1:-1);
 }
-_cae-=_caa.getTimezoneOffset();
-_cab=_cab.substr(0,_cab.length-d[0].length);
+_cbb-=_cb7.getTimezoneOffset();
+_cb8=_cb8.substr(0,_cb8.length-d[0].length);
 }
-var _caf="^([0-9]{2})(:?([0-9]{2})(:?([0-9]{2})(.([0-9]+))?)?)?$";
-d=_cab.match(new RegExp(_caf));
+var _cbc="^([0-9]{2})(:?([0-9]{2})(:?([0-9]{2})(.([0-9]+))?)?)?$";
+d=_cb8.match(new RegExp(_cbc));
 if(!d){
-dojo.debug("invalid time string: "+_cab);
+dojo.debug("invalid time string: "+_cb8);
 return null;
 }
-var _cb0=d[1];
+var _cbd=d[1];
 var mins=Number((d[3])?d[3]:0);
 var secs=(d[5])?d[5]:0;
 var ms=d[7]?(Number("0."+d[7])*1000):0;
-_caa.setHours(_cb0);
-_caa.setMinutes(mins);
-_caa.setSeconds(secs);
-_caa.setMilliseconds(ms);
-if(_cae!==0){
-_caa.setTime(_caa.getTime()+_cae*60000);
+_cb7.setHours(_cbd);
+_cb7.setMinutes(mins);
+_cb7.setSeconds(secs);
+_cb7.setMilliseconds(ms);
+if(_cbb!==0){
+_cb7.setTime(_cb7.getTime()+_cbb*60000);
 }
-return _caa;
+return _cb7;
 };
-dojo.date.fromIso8601Time=function(_cb4){
-return dojo.date.setIso8601Time(new Date(0,0),_cb4);
+dojo.date.fromIso8601Time=function(_cc1){
+return dojo.date.setIso8601Time(new Date(0,0),_cc1);
 };
-dojo.date.toRfc3339=function(_cb5,_cb6){
-if(!_cb5){
-_cb5=new Date();
+dojo.date.toRfc3339=function(_cc2,_cc3){
+if(!_cc2){
+_cc2=new Date();
 }
 var _=dojo.string.pad;
-var _cb8=[];
-if(_cb6!="timeOnly"){
-var date=[_(_cb5.getFullYear(),4),_(_cb5.getMonth()+1,2),_(_cb5.getDate(),2)].join("-");
-_cb8.push(date);
+var _cc5=[];
+if(_cc3!="timeOnly"){
+var date=[_(_cc2.getFullYear(),4),_(_cc2.getMonth()+1,2),_(_cc2.getDate(),2)].join("-");
+_cc5.push(date);
 }
-if(_cb6!="dateOnly"){
-var time=[_(_cb5.getHours(),2),_(_cb5.getMinutes(),2),_(_cb5.getSeconds(),2)].join(":");
-var _cbb=_cb5.getTimezoneOffset();
-time+=(_cbb>0?"-":"+")+_(Math.floor(Math.abs(_cbb)/60),2)+":"+_(Math.abs(_cbb)%60,2);
-_cb8.push(time);
+if(_cc3!="dateOnly"){
+var time=[_(_cc2.getHours(),2),_(_cc2.getMinutes(),2),_(_cc2.getSeconds(),2)].join(":");
+var _cc8=_cc2.getTimezoneOffset();
+time+=(_cc8>0?"-":"+")+_(Math.floor(Math.abs(_cc8)/60),2)+":"+_(Math.abs(_cc8)%60,2);
+_cc5.push(time);
 }
-return _cb8.join("T");
+return _cc5.join("T");
 };
-dojo.date.fromRfc3339=function(_cbc){
-if(_cbc.indexOf("Tany")!=-1){
-_cbc=_cbc.replace("Tany","");
+dojo.date.fromRfc3339=function(_cc9){
+if(_cc9.indexOf("Tany")!=-1){
+_cc9=_cc9.replace("Tany","");
 }
-var _cbd=new Date();
-return dojo.date.setIso8601(_cbd,_cbc);
+var _cca=new Date();
+return dojo.date.setIso8601(_cca,_cc9);
 };
 dojo.provide("dojo.date.common");
-dojo.date.setDayOfYear=function(_cbe,_cbf){
-_cbe.setMonth(0);
-_cbe.setDate(_cbf);
-return _cbe;
+dojo.date.setDayOfYear=function(_ccb,_ccc){
+_ccb.setMonth(0);
+_ccb.setDate(_ccc);
+return _ccb;
 };
-dojo.date.getDayOfYear=function(_cc0){
-var _cc1=_cc0.getFullYear();
-var _cc2=new Date(_cc1-1,11,31);
-return Math.floor((_cc0.getTime()-_cc2.getTime())/86400000);
+dojo.date.getDayOfYear=function(_ccd){
+var _cce=_ccd.getFullYear();
+var _ccf=new Date(_cce-1,11,31);
+return Math.floor((_ccd.getTime()-_ccf.getTime())/86400000);
 };
-dojo.date.setWeekOfYear=function(_cc3,week,_cc5){
+dojo.date.setWeekOfYear=function(_cd0,week,_cd2){
 if(arguments.length==1){
-_cc5=0;
+_cd2=0;
 }
 dojo.unimplemented("dojo.date.setWeekOfYear");
 };
-dojo.date.getWeekOfYear=function(_cc6,_cc7){
+dojo.date.getWeekOfYear=function(_cd3,_cd4){
 if(arguments.length==1){
-_cc7=0;
+_cd4=0;
 }
-var _cc8=new Date(_cc6.getFullYear(),0,1);
-var day=_cc8.getDay();
-_cc8.setDate(_cc8.getDate()-day+_cc7-(day>_cc7?7:0));
-return Math.floor((_cc6.getTime()-_cc8.getTime())/604800000);
+var _cd5=new Date(_cd3.getFullYear(),0,1);
+var day=_cd5.getDay();
+_cd5.setDate(_cd5.getDate()-day+_cd4-(day>_cd4?7:0));
+return Math.floor((_cd3.getTime()-_cd5.getTime())/604800000);
 };
-dojo.date.setIsoWeekOfYear=function(_cca,week,_ccc){
+dojo.date.setIsoWeekOfYear=function(_cd7,week,_cd9){
 if(arguments.length==1){
-_ccc=1;
+_cd9=1;
 }
 dojo.unimplemented("dojo.date.setIsoWeekOfYear");
 };
-dojo.date.getIsoWeekOfYear=function(_ccd,_cce){
+dojo.date.getIsoWeekOfYear=function(_cda,_cdb){
 if(arguments.length==1){
-_cce=1;
+_cdb=1;
 }
 dojo.unimplemented("dojo.date.getIsoWeekOfYear");
 };
 dojo.date.shortTimezones=["IDLW","BET","HST","MART","AKST","PST","MST","CST","EST","AST","NFT","BST","FST","AT","GMT","CET","EET","MSK","IRT","GST","AFT","AGTT","IST","NPT","ALMT","MMT","JT","AWST","JST","ACST","AEST","LHST","VUT","NFT","NZT","CHAST","PHOT","LINT"];
 dojo.date.timezoneOffsets=[-720,-660,-600,-570,-540,-480,-420,-360,-300,-240,-210,-180,-120,-60,0,60,120,180,210,240,270,300,330,345,360,390,420,480,540,570,600,630,660,690,720,765,780,840];
-dojo.date.getDaysInMonth=function(_ccf){
-var _cd0=_ccf.getMonth();
+dojo.date.getDaysInMonth=function(_cdc){
+var _cdd=_cdc.getMonth();
 var days=[31,28,31,30,31,30,31,31,30,31,30,31];
-if(_cd0==1&&dojo.date.isLeapYear(_ccf)){
+if(_cdd==1&&dojo.date.isLeapYear(_cdc)){
 return 29;
 }else{
-return days[_cd0];
+return days[_cdd];
 }
 };
-dojo.date.isLeapYear=function(_cd2){
-var year=_cd2.getFullYear();
+dojo.date.isLeapYear=function(_cdf){
+var year=_cdf.getFullYear();
 return (year%400==0)?true:(year%100==0)?false:(year%4==0)?true:false;
 };
-dojo.date.getTimezoneName=function(_cd4){
-var str=_cd4.toString();
+dojo.date.getTimezoneName=function(_ce1){
+var str=_ce1.toString();
 var tz="";
-var _cd7;
+var _ce4;
 var pos=str.indexOf("(");
 if(pos>-1){
 pos++;
 tz=str.substring(pos,str.indexOf(")"));
 }else{
 var pat=/([A-Z\/]+) \d{4}$/;
-if((_cd7=str.match(pat))){
-tz=_cd7[1];
+if((_ce4=str.match(pat))){
+tz=_ce4[1];
 }else{
-str=_cd4.toLocaleString();
+str=_ce1.toLocaleString();
 pat=/ ([A-Z\/]+)$/;
-if((_cd7=str.match(pat))){
-tz=_cd7[1];
+if((_ce4=str.match(pat))){
+tz=_ce4[1];
 }
 }
 }
 return tz=="AM"||tz=="PM"?"":tz;
 };
-dojo.date.getOrdinal=function(_cda){
-var date=_cda.getDate();
+dojo.date.getOrdinal=function(_ce7){
+var date=_ce7.getDate();
 if(date%100!=11&&date%10==1){
 return "st";
 }else{
@@ -15372,12 +15418,12 @@ return "th";
 }
 };
 dojo.date.compareTypes={DATE:1,TIME:2};
-dojo.date.compare=function(_cdc,_cdd,_cde){
-var dA=_cdc;
-var dB=_cdd||new Date();
+dojo.date.compare=function(_ce9,_cea,_ceb){
+var dA=_ce9;
+var dB=_cea||new Date();
 var now=new Date();
 with(dojo.date.compareTypes){
-var opt=_cde||(DATE|TIME);
+var opt=_ceb||(DATE|TIME);
 var d1=new Date((opt&DATE)?dA.getFullYear():now.getFullYear(),(opt&DATE)?dA.getMonth():now.getMonth(),(opt&DATE)?dA.getDate():now.getDate(),(opt&TIME)?dA.getHours():0,(opt&TIME)?dA.getMinutes():0,(opt&TIME)?dA.getSeconds():0);
 var d2=new Date((opt&DATE)?dB.getFullYear():now.getFullYear(),(opt&DATE)?dB.getMonth():now.getMonth(),(opt&DATE)?dB.getDate():now.getDate(),(opt&TIME)?dB.getHours():0,(opt&TIME)?dB.getMinutes():0,(opt&TIME)?dB.getSeconds():0);
 }
@@ -15390,7 +15436,7 @@ return -1;
 return 0;
 };
 dojo.date.dateParts={YEAR:0,MONTH:1,DAY:2,HOUR:3,MINUTE:4,SECOND:5,MILLISECOND:6,QUARTER:7,WEEK:8,WEEKDAY:9};
-dojo.date.add=function(dt,_ce6,incr){
+dojo.date.add=function(dt,_cf3,incr){
 if(typeof dt=="number"){
 dt=new Date(dt);
 }
@@ -15401,7 +15447,7 @@ sum.setDate(0);
 }
 var sum=new Date(dt);
 with(dojo.date.dateParts){
-switch(_ce6){
+switch(_cf3){
 case YEAR:
 sum.setFullYear(dt.getFullYear()+incr);
 fixOvershoot();
@@ -15419,7 +15465,7 @@ sum.setDate(dt.getDate()+incr);
 break;
 case WEEKDAY:
 var dat=dt.getDate();
-var _cea=0;
+var _cf7=0;
 var days=0;
 var strt=0;
 var trgt=0;
@@ -15427,10 +15473,10 @@ var adj=0;
 var mod=incr%5;
 if(mod==0){
 days=(incr>0)?5:-5;
-_cea=(incr>0)?((incr-5)/5):((incr+5)/5);
+_cf7=(incr>0)?((incr-5)/5):((incr+5)/5);
 }else{
 days=mod;
-_cea=parseInt(incr/5);
+_cf7=parseInt(incr/5);
 }
 strt=dt.getDay();
 if(strt==6&&incr>0){
@@ -15444,7 +15490,7 @@ trgt=(strt+days);
 if(trgt==0||trgt==6){
 adj=(incr>0)?2:-2;
 }
-sum.setDate(dat+(7*_cea)+days+adj);
+sum.setDate(dat+(7*_cf7)+days+adj);
 break;
 case HOUR:
 sum.setHours(sum.getHours()+incr);
@@ -15464,60 +15510,60 @@ break;
 }
 return sum;
 };
-dojo.date.diff=function(dtA,dtB,_cf2){
+dojo.date.diff=function(dtA,dtB,_cff){
 if(typeof dtA=="number"){
 dtA=new Date(dtA);
 }
 if(typeof dtB=="number"){
 dtB=new Date(dtB);
 }
-var _cf3=dtB.getFullYear()-dtA.getFullYear();
-var _cf4=(dtB.getMonth()-dtA.getMonth())+(_cf3*12);
-var _cf5=dtB.getTime()-dtA.getTime();
-var _cf6=_cf5/1000;
-var _cf7=_cf6/60;
-var _cf8=_cf7/60;
-var _cf9=_cf8/24;
-var _cfa=_cf9/7;
-var _cfb=0;
+var _d00=dtB.getFullYear()-dtA.getFullYear();
+var _d01=(dtB.getMonth()-dtA.getMonth())+(_d00*12);
+var _d02=dtB.getTime()-dtA.getTime();
+var _d03=_d02/1000;
+var _d04=_d03/60;
+var _d05=_d04/60;
+var _d06=_d05/24;
+var _d07=_d06/7;
+var _d08=0;
 with(dojo.date.dateParts){
-switch(_cf2){
+switch(_cff){
 case YEAR:
-_cfb=_cf3;
+_d08=_d00;
 break;
 case QUARTER:
 var mA=dtA.getMonth();
 var mB=dtB.getMonth();
 var qA=Math.floor(mA/3)+1;
 var qB=Math.floor(mB/3)+1;
-qB+=(_cf3*4);
-_cfb=qB-qA;
+qB+=(_d00*4);
+_d08=qB-qA;
 break;
 case MONTH:
-_cfb=_cf4;
+_d08=_d01;
 break;
 case WEEK:
-_cfb=parseInt(_cfa);
+_d08=parseInt(_d07);
 break;
 case DAY:
-_cfb=_cf9;
+_d08=_d06;
 break;
 case WEEKDAY:
-var days=Math.round(_cf9);
-var _d01=parseInt(days/7);
+var days=Math.round(_d06);
+var _d0e=parseInt(days/7);
 var mod=days%7;
 if(mod==0){
-days=_d01*5;
+days=_d0e*5;
 }else{
 var adj=0;
 var aDay=dtA.getDay();
 var bDay=dtB.getDay();
-_d01=parseInt(days/7);
+_d0e=parseInt(days/7);
 mod=days%7;
-var _d06=new Date(dtA);
-_d06.setDate(_d06.getDate()+(_d01*7));
-var _d07=_d06.getDay();
-if(_cf9>0){
+var _d13=new Date(dtA);
+_d13.setDate(_d13.getDate()+(_d0e*7));
+var _d14=_d13.getDay();
+if(_d06>0){
 switch(true){
 case aDay==6:
 adj=-1;
@@ -15531,14 +15577,14 @@ break;
 case bDay==0:
 adj=-2;
 break;
-case (_d07+mod)>5:
+case (_d14+mod)>5:
 adj=-2;
 break;
 default:
 break;
 }
 }else{
-if(_cf9<0){
+if(_d06<0){
 switch(true){
 case aDay==6:
 adj=0;
@@ -15552,7 +15598,7 @@ break;
 case bDay==0:
 adj=1;
 break;
-case (_d07+mod)<0:
+case (_d14+mod)<0:
 adj=2;
 break;
 default:
@@ -15561,116 +15607,116 @@ break;
 }
 }
 days+=adj;
-days-=(_d01*2);
+days-=(_d0e*2);
 }
-_cfb=days;
+_d08=days;
 break;
 case HOUR:
-_cfb=_cf8;
+_d08=_d05;
 break;
 case MINUTE:
-_cfb=_cf7;
+_d08=_d04;
 break;
 case SECOND:
-_cfb=_cf6;
+_d08=_d03;
 break;
 case MILLISECOND:
-_cfb=_cf5;
+_d08=_d02;
 break;
 default:
 break;
 }
 }
-return Math.round(_cfb);
+return Math.round(_d08);
 };
 dojo.provide("dojo.date.supplemental");
-dojo.date.getFirstDayOfWeek=function(_d08){
-var _d09={mv:5,ae:6,af:6,bh:6,dj:6,dz:6,eg:6,er:6,et:6,iq:6,ir:6,jo:6,ke:6,kw:6,lb:6,ly:6,ma:6,om:6,qa:6,sa:6,sd:6,so:6,tn:6,ye:6,as:0,au:0,az:0,bw:0,ca:0,cn:0,fo:0,ge:0,gl:0,gu:0,hk:0,ie:0,il:0,is:0,jm:0,jp:0,kg:0,kr:0,la:0,mh:0,mo:0,mp:0,mt:0,nz:0,ph:0,pk:0,sg:0,th:0,tt:0,tw:0,um:0,us:0,uz:0,vi:0,za:0,zw:0,et:0,mw:0,ng:0,tj:0,gb:0,sy:4};
-_d08=dojo.hostenv.normalizeLocale(_d08);
-var _d0a=_d08.split("-")[1];
-var dow=_d09[_d0a];
+dojo.date.getFirstDayOfWeek=function(_d15){
+var _d16={mv:5,ae:6,af:6,bh:6,dj:6,dz:6,eg:6,er:6,et:6,iq:6,ir:6,jo:6,ke:6,kw:6,lb:6,ly:6,ma:6,om:6,qa:6,sa:6,sd:6,so:6,tn:6,ye:6,as:0,au:0,az:0,bw:0,ca:0,cn:0,fo:0,ge:0,gl:0,gu:0,hk:0,ie:0,il:0,is:0,jm:0,jp:0,kg:0,kr:0,la:0,mh:0,mo:0,mp:0,mt:0,nz:0,ph:0,pk:0,sg:0,th:0,tt:0,tw:0,um:0,us:0,uz:0,vi:0,za:0,zw:0,et:0,mw:0,ng:0,tj:0,gb:0,sy:4};
+_d15=dojo.hostenv.normalizeLocale(_d15);
+var _d17=_d15.split("-")[1];
+var dow=_d16[_d17];
 return (typeof dow=="undefined")?1:dow;
 };
-dojo.date.getWeekend=function(_d0c){
-var _d0d={eg:5,il:5,sy:5,"in":0,ae:4,bh:4,dz:4,iq:4,jo:4,kw:4,lb:4,ly:4,ma:4,om:4,qa:4,sa:4,sd:4,tn:4,ye:4};
-var _d0e={ae:5,bh:5,dz:5,iq:5,jo:5,kw:5,lb:5,ly:5,ma:5,om:5,qa:5,sa:5,sd:5,tn:5,ye:5,af:5,ir:5,eg:6,il:6,sy:6};
-_d0c=dojo.hostenv.normalizeLocale(_d0c);
-var _d0f=_d0c.split("-")[1];
-var _d10=_d0d[_d0f];
-var end=_d0e[_d0f];
-if(typeof _d10=="undefined"){
-_d10=6;
+dojo.date.getWeekend=function(_d19){
+var _d1a={eg:5,il:5,sy:5,"in":0,ae:4,bh:4,dz:4,iq:4,jo:4,kw:4,lb:4,ly:4,ma:4,om:4,qa:4,sa:4,sd:4,tn:4,ye:4};
+var _d1b={ae:5,bh:5,dz:5,iq:5,jo:5,kw:5,lb:5,ly:5,ma:5,om:5,qa:5,sa:5,sd:5,tn:5,ye:5,af:5,ir:5,eg:6,il:6,sy:6};
+_d19=dojo.hostenv.normalizeLocale(_d19);
+var _d1c=_d19.split("-")[1];
+var _d1d=_d1a[_d1c];
+var end=_d1b[_d1c];
+if(typeof _d1d=="undefined"){
+_d1d=6;
 }
 if(typeof end=="undefined"){
 end=0;
 }
-return {start:_d10,end:end};
+return {start:_d1d,end:end};
 };
-dojo.date.isWeekend=function(_d12,_d13){
-var _d14=dojo.date.getWeekend(_d13);
-var day=(_d12||new Date()).getDay();
-if(_d14.end<_d14.start){
-_d14.end+=7;
-if(day<_d14.start){
+dojo.date.isWeekend=function(_d1f,_d20){
+var _d21=dojo.date.getWeekend(_d20);
+var day=(_d1f||new Date()).getDay();
+if(_d21.end<_d21.start){
+_d21.end+=7;
+if(day<_d21.start){
 day+=7;
 }
 }
-return day>=_d14.start&&day<=_d14.end;
+return day>=_d21.start&&day<=_d21.end;
 };
 dojo.provide("dojo.i18n.common");
-dojo.i18n.getLocalization=function(_d16,_d17,_d18){
+dojo.i18n.getLocalization=function(_d23,_d24,_d25){
 dojo.hostenv.preloadLocalizations();
-_d18=dojo.hostenv.normalizeLocale(_d18);
-var _d19=_d18.split("-");
-var _d1a=[_d16,"nls",_d17].join(".");
-var _d1b=dojo.hostenv.findModule(_d1a,true);
-var _d1c;
-for(var i=_d19.length;i>0;i--){
-var loc=_d19.slice(0,i).join("_");
-if(_d1b[loc]){
-_d1c=_d1b[loc];
+_d25=dojo.hostenv.normalizeLocale(_d25);
+var _d26=_d25.split("-");
+var _d27=[_d23,"nls",_d24].join(".");
+var _d28=dojo.hostenv.findModule(_d27,true);
+var _d29;
+for(var i=_d26.length;i>0;i--){
+var loc=_d26.slice(0,i).join("_");
+if(_d28[loc]){
+_d29=_d28[loc];
 break;
 }
 }
-if(!_d1c){
-_d1c=_d1b.ROOT;
+if(!_d29){
+_d29=_d28.ROOT;
 }
-if(_d1c){
-var _d1f=function(){
+if(_d29){
+var _d2c=function(){
 };
-_d1f.prototype=_d1c;
-return new _d1f();
+_d2c.prototype=_d29;
+return new _d2c();
 }
-dojo.raise("Bundle not found: "+_d17+" in "+_d16+" , locale="+_d18);
+dojo.raise("Bundle not found: "+_d24+" in "+_d23+" , locale="+_d25);
 };
-dojo.i18n.isLTR=function(_d20){
-var lang=dojo.hostenv.normalizeLocale(_d20).split("-")[0];
+dojo.i18n.isLTR=function(_d2d){
+var lang=dojo.hostenv.normalizeLocale(_d2d).split("-")[0];
 var RTL={ar:true,fa:true,he:true,ur:true,yi:true};
 return !RTL[lang];
 };
 dojo.provide("dojo.date.format");
 (function(){
-dojo.date.format=function(_d23,_d24){
-if(typeof _d24=="string"){
+dojo.date.format=function(_d30,_d31){
+if(typeof _d31=="string"){
 dojo.deprecated("dojo.date.format","To format dates with POSIX-style strings, please use dojo.date.strftime instead","0.5");
-return dojo.date.strftime(_d23,_d24);
+return dojo.date.strftime(_d30,_d31);
 }
-function formatPattern(_d25,_d26){
-return _d26.replace(/([a-z])\1*/ig,function(_d27){
+function formatPattern(_d32,_d33){
+return _d33.replace(/([a-z])\1*/ig,function(_d34){
 var s;
-var c=_d27.charAt(0);
-var l=_d27.length;
+var c=_d34.charAt(0);
+var l=_d34.length;
 var pad;
-var _d2c=["abbr","wide","narrow"];
+var _d39=["abbr","wide","narrow"];
 switch(c){
 case "G":
 if(l>3){
 dojo.unimplemented("Era format not implemented");
 }
-s=info.eras[_d25.getFullYear()<0?1:0];
+s=info.eras[_d32.getFullYear()<0?1:0];
 break;
 case "y":
-s=_d25.getFullYear();
+s=_d32.getFullYear();
 switch(l){
 case 1:
 break;
@@ -15683,7 +15729,7 @@ pad=true;
 break;
 case "Q":
 case "q":
-s=Math.ceil((_d25.getMonth()+1)/3);
+s=Math.ceil((_d32.getMonth()+1)/3);
 switch(l){
 case 1:
 case 2:
@@ -15696,8 +15742,8 @@ dojo.unimplemented("Quarter format not implemented");
 break;
 case "M":
 case "L":
-var m=_d25.getMonth();
-var _d2f;
+var m=_d32.getMonth();
+var _d3c;
 switch(l){
 case 1:
 case 2:
@@ -15707,39 +15753,39 @@ break;
 case 3:
 case 4:
 case 5:
-_d2f=_d2c[l-3];
+_d3c=_d39[l-3];
 break;
 }
-if(_d2f){
+if(_d3c){
 var type=(c=="L")?"standalone":"format";
-var prop=["months",type,_d2f].join("-");
+var prop=["months",type,_d3c].join("-");
 s=info[prop][m];
 }
 break;
 case "w":
-var _d32=0;
-s=dojo.date.getWeekOfYear(_d25,_d32);
+var _d3f=0;
+s=dojo.date.getWeekOfYear(_d32,_d3f);
 pad=true;
 break;
 case "d":
-s=_d25.getDate();
+s=_d32.getDate();
 pad=true;
 break;
 case "D":
-s=dojo.date.getDayOfYear(_d25);
+s=dojo.date.getDayOfYear(_d32);
 pad=true;
 break;
 case "E":
 case "e":
 case "c":
-var d=_d25.getDay();
-var _d2f;
+var d=_d32.getDay();
+var _d3c;
 switch(l){
 case 1:
 case 2:
 if(c=="e"){
-var _d34=dojo.date.getFirstDayOfWeek(_d24.locale);
-d=(d-_d34+7)%7;
+var _d41=dojo.date.getFirstDayOfWeek(_d31.locale);
+d=(d-_d41+7)%7;
 }
 if(c!="c"){
 s=d+1;
@@ -15749,24 +15795,24 @@ break;
 case 3:
 case 4:
 case 5:
-_d2f=_d2c[l-3];
+_d3c=_d39[l-3];
 break;
 }
-if(_d2f){
+if(_d3c){
 var type=(c=="c")?"standalone":"format";
-var prop=["days",type,_d2f].join("-");
+var prop=["days",type,_d3c].join("-");
 s=info[prop][d];
 }
 break;
 case "a":
-var _d35=(_d25.getHours()<12)?"am":"pm";
-s=info[_d35];
+var _d42=(_d32.getHours()<12)?"am":"pm";
+s=info[_d42];
 break;
 case "h":
 case "H":
 case "K":
 case "k":
-var h=_d25.getHours();
+var h=_d32.getHours();
 switch(c){
 case "h":
 s=(h%12)||12;
@@ -15784,26 +15830,26 @@ break;
 pad=true;
 break;
 case "m":
-s=_d25.getMinutes();
+s=_d32.getMinutes();
 pad=true;
 break;
 case "s":
-s=_d25.getSeconds();
+s=_d32.getSeconds();
 pad=true;
 break;
 case "S":
-s=Math.round(_d25.getMilliseconds()*Math.pow(10,l-3));
+s=Math.round(_d32.getMilliseconds()*Math.pow(10,l-3));
 break;
 case "v":
 case "z":
-s=dojo.date.getTimezoneName(_d25);
+s=dojo.date.getTimezoneName(_d32);
 if(s){
 break;
 }
 l=4;
 case "Z":
-var _d37=_d25.getTimezoneOffset();
-var tz=[(_d37<=0?"+":"-"),dojo.string.pad(Math.floor(Math.abs(_d37)/60),2),dojo.string.pad(Math.abs(_d37)%60,2)];
+var _d44=_d32.getTimezoneOffset();
+var tz=[(_d44<=0?"+":"-"),dojo.string.pad(Math.floor(Math.abs(_d44)/60),2),dojo.string.pad(Math.abs(_d44)%60,2)];
 if(l==4){
 tz.splice(0,0,"GMT");
 tz.splice(3,0,":");
@@ -15816,11 +15862,11 @@ case "W":
 case "F":
 case "g":
 case "A":
-dojo.debug(_d27+" modifier not yet implemented");
+dojo.debug(_d34+" modifier not yet implemented");
 s="?";
 break;
 default:
-dojo.raise("dojo.date.format: invalid pattern char: "+_d26);
+dojo.raise("dojo.date.format: invalid pattern char: "+_d33);
 }
 if(pad){
 s=dojo.string.pad(s,l);
@@ -15828,126 +15874,126 @@ s=dojo.string.pad(s,l);
 return s;
 });
 }
-_d24=_d24||{};
-var _d39=dojo.hostenv.normalizeLocale(_d24.locale);
-var _d3a=_d24.formatLength||"full";
-var info=dojo.date._getGregorianBundle(_d39);
+_d31=_d31||{};
+var _d46=dojo.hostenv.normalizeLocale(_d31.locale);
+var _d47=_d31.formatLength||"full";
+var info=dojo.date._getGregorianBundle(_d46);
 var str=[];
-var _d3c=dojo.lang.curry(this,formatPattern,_d23);
-if(_d24.selector!="timeOnly"){
-var _d3d=_d24.datePattern||info["dateFormat-"+_d3a];
-if(_d3d){
-str.push(_processPattern(_d3d,_d3c));
+var _d49=dojo.lang.curry(this,formatPattern,_d30);
+if(_d31.selector!="timeOnly"){
+var _d4a=_d31.datePattern||info["dateFormat-"+_d47];
+if(_d4a){
+str.push(_processPattern(_d4a,_d49));
 }
 }
-if(_d24.selector!="dateOnly"){
-var _d3e=_d24.timePattern||info["timeFormat-"+_d3a];
-if(_d3e){
-str.push(_processPattern(_d3e,_d3c));
+if(_d31.selector!="dateOnly"){
+var _d4b=_d31.timePattern||info["timeFormat-"+_d47];
+if(_d4b){
+str.push(_processPattern(_d4b,_d49));
 }
 }
-var _d3f=str.join(" ");
-return _d3f;
+var _d4c=str.join(" ");
+return _d4c;
 };
-dojo.date.parse=function(_d40,_d41){
-_d41=_d41||{};
-var _d42=dojo.hostenv.normalizeLocale(_d41.locale);
-var info=dojo.date._getGregorianBundle(_d42);
-var _d44=_d41.formatLength||"full";
-if(!_d41.selector){
-_d41.selector="dateOnly";
+dojo.date.parse=function(_d4d,_d4e){
+_d4e=_d4e||{};
+var _d4f=dojo.hostenv.normalizeLocale(_d4e.locale);
+var info=dojo.date._getGregorianBundle(_d4f);
+var _d51=_d4e.formatLength||"full";
+if(!_d4e.selector){
+_d4e.selector="dateOnly";
 }
-var _d45=_d41.datePattern||info["dateFormat-"+_d44];
-var _d46=_d41.timePattern||info["timeFormat-"+_d44];
-var _d47;
-if(_d41.selector=="dateOnly"){
-_d47=_d45;
+var _d52=_d4e.datePattern||info["dateFormat-"+_d51];
+var _d53=_d4e.timePattern||info["timeFormat-"+_d51];
+var _d54;
+if(_d4e.selector=="dateOnly"){
+_d54=_d52;
 }else{
-if(_d41.selector=="timeOnly"){
-_d47=_d46;
+if(_d4e.selector=="timeOnly"){
+_d54=_d53;
 }else{
-if(_d41.selector=="dateTime"){
-_d47=_d45+" "+_d46;
+if(_d4e.selector=="dateTime"){
+_d54=_d52+" "+_d53;
 }else{
-var msg="dojo.date.parse: Unknown selector param passed: '"+_d41.selector+"'.";
+var msg="dojo.date.parse: Unknown selector param passed: '"+_d4e.selector+"'.";
 msg+=" Defaulting to date pattern.";
 dojo.debug(msg);
-_d47=_d45;
+_d54=_d52;
 }
 }
 }
-var _d49=[];
-var _d4a=_processPattern(_d47,dojo.lang.curry(this,_buildDateTimeRE,_d49,info,_d41));
-var _d4b=new RegExp("^"+_d4a+"$");
-var _d4c=_d4b.exec(_d40);
-if(!_d4c){
+var _d56=[];
+var _d57=_processPattern(_d54,dojo.lang.curry(this,_buildDateTimeRE,_d56,info,_d4e));
+var _d58=new RegExp("^"+_d57+"$");
+var _d59=_d58.exec(_d4d);
+if(!_d59){
 return null;
 }
-var _d4d=["abbr","wide","narrow"];
-var _d4e=new Date(1972,0);
-var _d4f={};
-for(var i=1;i<_d4c.length;i++){
-var grp=_d49[i-1];
+var _d5a=["abbr","wide","narrow"];
+var _d5b=new Date(1972,0);
+var _d5c={};
+for(var i=1;i<_d59.length;i++){
+var grp=_d56[i-1];
 var l=grp.length;
-var v=_d4c[i];
+var v=_d59[i];
 switch(grp.charAt(0)){
 case "y":
 if(l!=2){
-_d4e.setFullYear(v);
-_d4f.year=v;
+_d5b.setFullYear(v);
+_d5c.year=v;
 }else{
 if(v<100){
 v=Number(v);
 var year=""+new Date().getFullYear();
-var _d55=year.substring(0,2)*100;
-var _d56=Number(year.substring(2,4));
-var _d57=Math.min(_d56+20,99);
-var num=(v<_d57)?_d55+v:_d55-100+v;
-_d4e.setFullYear(num);
-_d4f.year=num;
+var _d62=year.substring(0,2)*100;
+var _d63=Number(year.substring(2,4));
+var _d64=Math.min(_d63+20,99);
+var num=(v<_d64)?_d62+v:_d62-100+v;
+_d5b.setFullYear(num);
+_d5c.year=num;
 }else{
-if(_d41.strict){
+if(_d4e.strict){
 return null;
 }
-_d4e.setFullYear(v);
-_d4f.year=v;
+_d5b.setFullYear(v);
+_d5c.year=v;
 }
 }
 break;
 case "M":
 if(l>2){
-if(!_d41.strict){
+if(!_d4e.strict){
 v=v.replace(/\./g,"");
 v=v.toLowerCase();
 }
-var _d59=info["months-format-"+_d4d[l-3]].concat();
-for(var j=0;j<_d59.length;j++){
-if(!_d41.strict){
-_d59[j]=_d59[j].toLowerCase();
+var _d66=info["months-format-"+_d5a[l-3]].concat();
+for(var j=0;j<_d66.length;j++){
+if(!_d4e.strict){
+_d66[j]=_d66[j].toLowerCase();
 }
-if(v==_d59[j]){
-_d4e.setMonth(j);
-_d4f.month=j;
+if(v==_d66[j]){
+_d5b.setMonth(j);
+_d5c.month=j;
 break;
 }
 }
-if(j==_d59.length){
+if(j==_d66.length){
 dojo.debug("dojo.date.parse: Could not parse month name: '"+v+"'.");
 return null;
 }
 }else{
-_d4e.setMonth(v-1);
-_d4f.month=v-1;
+_d5b.setMonth(v-1);
+_d5c.month=v-1;
 }
 break;
 case "E":
 case "e":
-if(!_d41.strict){
+if(!_d4e.strict){
 v=v.toLowerCase();
 }
-var days=info["days-format-"+_d4d[l-3]].concat();
+var days=info["days-format-"+_d5a[l-3]].concat();
 for(var j=0;j<days.length;j++){
-if(!_d41.strict){
+if(!_d4e.strict){
 days[j]=days[j].toLowerCase();
 }
 if(v==days[j]){
@@ -15960,27 +16006,27 @@ return null;
 }
 break;
 case "d":
-_d4e.setDate(v);
-_d4f.date=v;
+_d5b.setDate(v);
+_d5c.date=v;
 break;
 case "a":
-var am=_d41.am||info.am;
-var pm=_d41.pm||info.pm;
-if(!_d41.strict){
+var am=_d4e.am||info.am;
+var pm=_d4e.pm||info.pm;
+if(!_d4e.strict){
 v=v.replace(/\./g,"").toLowerCase();
 am=am.replace(/\./g,"").toLowerCase();
 pm=pm.replace(/\./g,"").toLowerCase();
 }
-if(_d41.strict&&v!=am&&v!=pm){
+if(_d4e.strict&&v!=am&&v!=pm){
 dojo.debug("dojo.date.parse: Could not parse am/pm part.");
 return null;
 }
-var _d5e=_d4e.getHours();
-if(v==pm&&_d5e<12){
-_d4e.setHours(_d5e+12);
+var _d6b=_d5b.getHours();
+if(v==pm&&_d6b<12){
+_d5b.setHours(_d6b+12);
 }else{
-if(v==am&&_d5e==12){
-_d4e.setHours(0);
+if(v==am&&_d6b==12){
+_d5b.setHours(0);
 }
 }
 break;
@@ -15995,59 +16041,59 @@ if(v>23){
 dojo.debug("dojo.date.parse: Illegal hours value");
 return null;
 }
-_d4e.setHours(v);
+_d5b.setHours(v);
 break;
 case "m":
-_d4e.setMinutes(v);
+_d5b.setMinutes(v);
 break;
 case "s":
-_d4e.setSeconds(v);
+_d5b.setSeconds(v);
 break;
 case "S":
-_d4e.setMilliseconds(v);
+_d5b.setMilliseconds(v);
 break;
 default:
 dojo.unimplemented("dojo.date.parse: unsupported pattern char="+grp.charAt(0));
 }
 }
-if(_d4f.year&&_d4e.getFullYear()!=_d4f.year){
-dojo.debug("Parsed year: '"+_d4e.getFullYear()+"' did not match input year: '"+_d4f.year+"'.");
+if(_d5c.year&&_d5b.getFullYear()!=_d5c.year){
+dojo.debug("Parsed year: '"+_d5b.getFullYear()+"' did not match input year: '"+_d5c.year+"'.");
 return null;
 }
-if(_d4f.month&&_d4e.getMonth()!=_d4f.month){
-dojo.debug("Parsed month: '"+_d4e.getMonth()+"' did not match input month: '"+_d4f.month+"'.");
+if(_d5c.month&&_d5b.getMonth()!=_d5c.month){
+dojo.debug("Parsed month: '"+_d5b.getMonth()+"' did not match input month: '"+_d5c.month+"'.");
 return null;
 }
-if(_d4f.date&&_d4e.getDate()!=_d4f.date){
-dojo.debug("Parsed day of month: '"+_d4e.getDate()+"' did not match input day of month: '"+_d4f.date+"'.");
+if(_d5c.date&&_d5b.getDate()!=_d5c.date){
+dojo.debug("Parsed day of month: '"+_d5b.getDate()+"' did not match input day of month: '"+_d5c.date+"'.");
 return null;
 }
-return _d4e;
+return _d5b;
 };
-function _processPattern(_d5f,_d60,_d61,_d62){
-var _d63=function(x){
+function _processPattern(_d6c,_d6d,_d6e,_d6f){
+var _d70=function(x){
 return x;
 };
-_d60=_d60||_d63;
-_d61=_d61||_d63;
-_d62=_d62||_d63;
-var _d65=_d5f.match(/(''|[^'])+/g);
-var _d66=false;
-for(var i=0;i<_d65.length;i++){
-if(!_d65[i]){
-_d65[i]="";
+_d6d=_d6d||_d70;
+_d6e=_d6e||_d70;
+_d6f=_d6f||_d70;
+var _d72=_d6c.match(/(''|[^'])+/g);
+var _d73=false;
+for(var i=0;i<_d72.length;i++){
+if(!_d72[i]){
+_d72[i]="";
 }else{
-_d65[i]=(_d66?_d61:_d60)(_d65[i]);
-_d66=!_d66;
+_d72[i]=(_d73?_d6e:_d6d)(_d72[i]);
+_d73=!_d73;
 }
 }
-return _d62(_d65.join(""));
+return _d6f(_d72.join(""));
 }
-function _buildDateTimeRE(_d68,info,_d6a,_d6b){
-return _d6b.replace(/([a-z])\1*/ig,function(_d6c){
+function _buildDateTimeRE(_d75,info,_d77,_d78){
+return _d78.replace(/([a-z])\1*/ig,function(_d79){
 var s;
-var c=_d6c.charAt(0);
-var l=_d6c.length;
+var c=_d79.charAt(0);
+var l=_d79.length;
 switch(c){
 case "y":
 s="\\d"+((l==2)?"{2,4}":"+");
@@ -16075,9 +16121,9 @@ case "S":
 s="\\d{1,3}";
 break;
 case "a":
-var am=_d6a.am||info.am||"AM";
-var pm=_d6a.pm||info.pm||"PM";
-if(_d6a.strict){
+var am=_d77.am||info.am||"AM";
+var pm=_d77.pm||info.pm||"PM";
+if(_d77.strict){
 s=am+"|"+pm;
 }else{
 s=am;
@@ -16087,50 +16133,50 @@ s+=(pm!=pm.toLowerCase())?pm+"|"+pm.toLowerCase():pm;
 }
 break;
 default:
-dojo.unimplemented("parse of date format, pattern="+_d6b);
+dojo.unimplemented("parse of date format, pattern="+_d78);
 }
-if(_d68){
-_d68.push(_d6c);
+if(_d75){
+_d75.push(_d79);
 }
 return "\\s*("+s+")\\s*";
 });
 }
 })();
-dojo.date.strftime=function(_d72,_d73,_d74){
-var _d75=null;
+dojo.date.strftime=function(_d7f,_d80,_d81){
+var _d82=null;
 function _(s,n){
-return dojo.string.pad(s,n||2,_d75||"0");
+return dojo.string.pad(s,n||2,_d82||"0");
 }
-var info=dojo.date._getGregorianBundle(_d74);
-function $(_d79){
-switch(_d79){
+var info=dojo.date._getGregorianBundle(_d81);
+function $(_d86){
+switch(_d86){
 case "a":
-return dojo.date.getDayShortName(_d72,_d74);
+return dojo.date.getDayShortName(_d7f,_d81);
 case "A":
-return dojo.date.getDayName(_d72,_d74);
+return dojo.date.getDayName(_d7f,_d81);
 case "b":
 case "h":
-return dojo.date.getMonthShortName(_d72,_d74);
+return dojo.date.getMonthShortName(_d7f,_d81);
 case "B":
-return dojo.date.getMonthName(_d72,_d74);
+return dojo.date.getMonthName(_d7f,_d81);
 case "c":
-return dojo.date.format(_d72,{locale:_d74});
+return dojo.date.format(_d7f,{locale:_d81});
 case "C":
-return _(Math.floor(_d72.getFullYear()/100));
+return _(Math.floor(_d7f.getFullYear()/100));
 case "d":
-return _(_d72.getDate());
+return _(_d7f.getDate());
 case "D":
 return $("m")+"/"+$("d")+"/"+$("y");
 case "e":
-if(_d75==null){
-_d75=" ";
+if(_d82==null){
+_d82=" ";
 }
-return _(_d72.getDate());
+return _(_d7f.getDate());
 case "f":
-if(_d75==null){
-_d75=" ";
+if(_d82==null){
+_d82=" ";
 }
-return _(_d72.getMonth()+1);
+return _(_d7f.getMonth()+1);
 case "g":
 break;
 case "G":
@@ -16139,171 +16185,171 @@ break;
 case "F":
 return $("Y")+"-"+$("m")+"-"+$("d");
 case "H":
-return _(_d72.getHours());
+return _(_d7f.getHours());
 case "I":
-return _(_d72.getHours()%12||12);
+return _(_d7f.getHours()%12||12);
 case "j":
-return _(dojo.date.getDayOfYear(_d72),3);
+return _(dojo.date.getDayOfYear(_d7f),3);
 case "k":
-if(_d75==null){
-_d75=" ";
+if(_d82==null){
+_d82=" ";
 }
-return _(_d72.getHours());
+return _(_d7f.getHours());
 case "l":
-if(_d75==null){
-_d75=" ";
+if(_d82==null){
+_d82=" ";
 }
-return _(_d72.getHours()%12||12);
+return _(_d7f.getHours()%12||12);
 case "m":
-return _(_d72.getMonth()+1);
+return _(_d7f.getMonth()+1);
 case "M":
-return _(_d72.getMinutes());
+return _(_d7f.getMinutes());
 case "n":
 return "\n";
 case "p":
-return info[_d72.getHours()<12?"am":"pm"];
+return info[_d7f.getHours()<12?"am":"pm"];
 case "r":
 return $("I")+":"+$("M")+":"+$("S")+" "+$("p");
 case "R":
 return $("H")+":"+$("M");
 case "S":
-return _(_d72.getSeconds());
+return _(_d7f.getSeconds());
 case "t":
 return "\t";
 case "T":
 return $("H")+":"+$("M")+":"+$("S");
 case "u":
-return String(_d72.getDay()||7);
+return String(_d7f.getDay()||7);
 case "U":
-return _(dojo.date.getWeekOfYear(_d72));
+return _(dojo.date.getWeekOfYear(_d7f));
 case "V":
-return _(dojo.date.getIsoWeekOfYear(_d72));
+return _(dojo.date.getIsoWeekOfYear(_d7f));
 case "W":
-return _(dojo.date.getWeekOfYear(_d72,1));
+return _(dojo.date.getWeekOfYear(_d7f,1));
 case "w":
-return String(_d72.getDay());
+return String(_d7f.getDay());
 case "x":
-return dojo.date.format(_d72,{selector:"dateOnly",locale:_d74});
+return dojo.date.format(_d7f,{selector:"dateOnly",locale:_d81});
 case "X":
-return dojo.date.format(_d72,{selector:"timeOnly",locale:_d74});
+return dojo.date.format(_d7f,{selector:"timeOnly",locale:_d81});
 case "y":
-return _(_d72.getFullYear()%100);
+return _(_d7f.getFullYear()%100);
 case "Y":
-return String(_d72.getFullYear());
+return String(_d7f.getFullYear());
 case "z":
-var _d7a=_d72.getTimezoneOffset();
-return (_d7a>0?"-":"+")+_(Math.floor(Math.abs(_d7a)/60))+":"+_(Math.abs(_d7a)%60);
+var _d87=_d7f.getTimezoneOffset();
+return (_d87>0?"-":"+")+_(Math.floor(Math.abs(_d87)/60))+":"+_(Math.abs(_d87)%60);
 case "Z":
-return dojo.date.getTimezoneName(_d72);
+return dojo.date.getTimezoneName(_d7f);
 case "%":
 return "%";
 }
 }
-var _d7b="";
+var _d88="";
 var i=0;
-var _d7d=0;
-var _d7e=null;
-while((_d7d=_d73.indexOf("%",i))!=-1){
-_d7b+=_d73.substring(i,_d7d++);
-switch(_d73.charAt(_d7d++)){
+var _d8a=0;
+var _d8b=null;
+while((_d8a=_d80.indexOf("%",i))!=-1){
+_d88+=_d80.substring(i,_d8a++);
+switch(_d80.charAt(_d8a++)){
 case "_":
-_d75=" ";
+_d82=" ";
 break;
 case "-":
-_d75="";
+_d82="";
 break;
 case "0":
-_d75="0";
+_d82="0";
 break;
 case "^":
-_d7e="upper";
+_d8b="upper";
 break;
 case "*":
-_d7e="lower";
+_d8b="lower";
 break;
 case "#":
-_d7e="swap";
+_d8b="swap";
 break;
 default:
-_d75=null;
-_d7d--;
+_d82=null;
+_d8a--;
 break;
 }
-var _d7f=$(_d73.charAt(_d7d++));
-switch(_d7e){
+var _d8c=$(_d80.charAt(_d8a++));
+switch(_d8b){
 case "upper":
-_d7f=_d7f.toUpperCase();
+_d8c=_d8c.toUpperCase();
 break;
 case "lower":
-_d7f=_d7f.toLowerCase();
+_d8c=_d8c.toLowerCase();
 break;
 case "swap":
-var _d80=_d7f.toLowerCase();
-var _d81="";
+var _d8d=_d8c.toLowerCase();
+var _d8e="";
 var j=0;
 var ch="";
-while(j<_d7f.length){
-ch=_d7f.charAt(j);
-_d81+=(ch==_d80.charAt(j))?ch.toUpperCase():ch.toLowerCase();
+while(j<_d8c.length){
+ch=_d8c.charAt(j);
+_d8e+=(ch==_d8d.charAt(j))?ch.toUpperCase():ch.toLowerCase();
 j++;
 }
-_d7f=_d81;
+_d8c=_d8e;
 break;
 default:
 break;
 }
-_d7e=null;
-_d7b+=_d7f;
-i=_d7d;
+_d8b=null;
+_d88+=_d8c;
+i=_d8a;
 }
-_d7b+=_d73.substring(i);
-return _d7b;
+_d88+=_d80.substring(i);
+return _d88;
 };
 (function(){
-var _d84=[];
-dojo.date.addCustomFormats=function(_d85,_d86){
-_d84.push({pkg:_d85,name:_d86});
+var _d91=[];
+dojo.date.addCustomFormats=function(_d92,_d93){
+_d91.push({pkg:_d92,name:_d93});
 };
-dojo.date._getGregorianBundle=function(_d87){
-var _d88={};
-dojo.lang.forEach(_d84,function(desc){
-var _d8a=dojo.i18n.getLocalization(desc.pkg,desc.name,_d87);
-_d88=dojo.lang.mixin(_d88,_d8a);
+dojo.date._getGregorianBundle=function(_d94){
+var _d95={};
+dojo.lang.forEach(_d91,function(desc){
+var _d97=dojo.i18n.getLocalization(desc.pkg,desc.name,_d94);
+_d95=dojo.lang.mixin(_d95,_d97);
 },this);
-return _d88;
+return _d95;
 };
 })();
 dojo.date.addCustomFormats("dojo.i18n.calendar","gregorian");
 dojo.date.addCustomFormats("dojo.i18n.calendar","gregorianExtras");
-dojo.date.getNames=function(item,type,use,_d8e){
-var _d8f;
-var _d90=dojo.date._getGregorianBundle(_d8e);
-var _d91=[item,use,type];
+dojo.date.getNames=function(item,type,use,_d9b){
+var _d9c;
+var _d9d=dojo.date._getGregorianBundle(_d9b);
+var _d9e=[item,use,type];
 if(use=="standAlone"){
-_d8f=_d90[_d91.join("-")];
+_d9c=_d9d[_d9e.join("-")];
 }
-_d91[1]="format";
-return (_d8f||_d90[_d91.join("-")]).concat();
+_d9e[1]="format";
+return (_d9c||_d9d[_d9e.join("-")]).concat();
 };
-dojo.date.getDayName=function(_d92,_d93){
-return dojo.date.getNames("days","wide","format",_d93)[_d92.getDay()];
+dojo.date.getDayName=function(_d9f,_da0){
+return dojo.date.getNames("days","wide","format",_da0)[_d9f.getDay()];
 };
-dojo.date.getDayShortName=function(_d94,_d95){
-return dojo.date.getNames("days","abbr","format",_d95)[_d94.getDay()];
+dojo.date.getDayShortName=function(_da1,_da2){
+return dojo.date.getNames("days","abbr","format",_da2)[_da1.getDay()];
 };
-dojo.date.getMonthName=function(_d96,_d97){
-return dojo.date.getNames("months","wide","format",_d97)[_d96.getMonth()];
+dojo.date.getMonthName=function(_da3,_da4){
+return dojo.date.getNames("months","wide","format",_da4)[_da3.getMonth()];
 };
-dojo.date.getMonthShortName=function(_d98,_d99){
-return dojo.date.getNames("months","abbr","format",_d99)[_d98.getMonth()];
+dojo.date.getMonthShortName=function(_da5,_da6){
+return dojo.date.getNames("months","abbr","format",_da6)[_da5.getMonth()];
 };
-dojo.date.toRelativeString=function(_d9a){
+dojo.date.toRelativeString=function(_da7){
 var now=new Date();
-var diff=(now-_d9a)/1000;
+var diff=(now-_da7)/1000;
 var end=" ago";
-var _d9e=false;
+var _dab=false;
 if(diff<0){
-_d9e=true;
+_dab=true;
 end=" from now";
 diff=-diff;
 }
@@ -16322,22 +16368,22 @@ return diff+" hour"+(diff==1?"":"s")+end;
 if(diff<60*60*24*7){
 diff=Math.round(diff/(3600*24));
 if(diff==1){
-return _d9e?"Tomorrow":"Yesterday";
+return _dab?"Tomorrow":"Yesterday";
 }else{
 return diff+" days"+end;
 }
 }
-return dojo.date.format(_d9a);
+return dojo.date.format(_da7);
 };
-dojo.date.toSql=function(_d9f,_da0){
-return dojo.date.strftime(_d9f,"%F"+!_da0?" %T":"");
+dojo.date.toSql=function(_dac,_dad){
+return dojo.date.strftime(_dac,"%F"+!_dad?" %T":"");
 };
-dojo.date.fromSql=function(_da1){
-var _da2=_da1.split(/[\- :]/g);
-while(_da2.length<6){
-_da2.push(0);
+dojo.date.fromSql=function(_dae){
+var _daf=_dae.split(/[\- :]/g);
+while(_daf.length<6){
+_daf.push(0);
 }
-return new Date(_da2[0],(parseInt(_da2[1],10)-1),_da2[2],_da2[3],_da2[4],_da2[5]);
+return new Date(_daf[0],(parseInt(_daf[1],10)-1),_daf[2],_daf[3],_daf[4],_daf[5]);
 };
 dojo.provide("dojo.widget.TimePicker");
 dojo.widget.defineWidget("dojo.widget.TimePicker",dojo.widget.HtmlWidget,function(){
@@ -16351,13 +16397,13 @@ this.any="any";
 this.selectedTime={hour:"",minute:"",amPm:"",anyTime:false};
 this.hourIndexMap=["",2,4,6,8,10,1,3,5,7,9,11,0];
 this.minuteIndexMap=[0,2,4,6,8,10,1,3,5,7,9,11];
-},{isContainer:false,templateString:"<div class=\"timePickerContainer\" dojoAttachPoint=\"timePickerContainerNode\">\n\t<table class=\"timeContainer\" cellspacing=\"0\" >\n\t\t<thead>\n\t\t\t<tr>\n\t\t\t\t<td class=\"timeCorner cornerTopLeft\" valign=\"top\">&nbsp;</td>\n\t\t\t\t<td class=\"timeLabelContainer hourSelector\">${this.calendar.field-hour}</td>\n\t\t\t\t<td class=\"timeLabelContainer minutesHeading\">${this.calendar.field-minute}</td>\n\t\t\t\t<td class=\"timeCorner cornerTopRight\" valign=\"top\">&nbsp;</td>\n\t\t\t</tr>\n\t\t</thead>\n\t\t<tbody>\n\t\t\t<tr>\n\t\t\t\t<td valign=\"top\" colspan=\"2\" class=\"hours\">\n\t\t\t\t\t<table align=\"center\">\n\t\t\t\t\t\t<tbody dojoAttachPoint=\"hourContainerNode\"  \n\t\t\t\t\t\t\tdojoAttachEvent=\"onClick: onSetSelectedHour;\">\n\t\t\t\t\t\t\t<tr>\n\t\t\t\t\t\t\t\t<td>12</td>\n\t\t\t\t\t\t\t\t<td>6</td>\n\t\t\t\t\t\t\t</tr>\n\t\t\t\t\t\t\t<tr>\n\t\t\t\t\t\t\t\t<td>1</td>\n\t\t\t\t\t\t\t\t<td>7</td>\n\t\t\t\t\t\t\t</tr>\n\t\t\t\t\t\t\t<tr>\n\t\t\t\t\t\t\t\t<td>2</td>\n\t\t\t\t\t\t\t\t<td>8</td>\n\t\t\t\t\t\t\t</tr>\n\t\t\t\t\t\t\t<tr>\n\t\t\t\t\t\t\t\t<td>3</td>\n\t\t\t\t\t\t\t\t<td>9</td>\n\t\t\t\t\t\t\t</tr>\n\t\t\t\t\t\t\t<tr>\n\t\t\t\t\t\t\t\t<td>4</td>\n\t\t\t\t\t\t\t\t<td>10</td>\n\t\t\t\t\t\t\t</tr>\n\t\t\t\t\t\t\t<tr>\n\t\t\t\t\t\t\t\t<td>5</td>\n\t\t\t\t\t\t\t\t<td>11</td>\n\t\t\t\t\t\t\t</tr>\n\t\t\t\t\t\t</tbody>\n\t\t\t\t\t</table>\n\t\t\t\t</td>\n\t\t\t\t<td valign=\"top\" class=\"minutes\" colspan=\"2\">\n\t\t\t\t\t<table align=\"center\">\n\t\t\t\t\t\t<tbody dojoAttachPoint=\"minuteContainerNode\" \n\t\t\t\t\t\t\tdojoAttachEvent=\"onClick: onSetSelectedMinute;\">\n\t\t\t\t\t\t\t<tr>\n\t\t\t\t\t\t\t\t<td>00</td>\n\t\t\t\t\t\t\t\t<td>30</td>\n\t\t\t\t\t\t\t</tr>\n\t\t\t\t\t\t\t<tr>\n\t\t\t\t\t\t\t\t<td>05</td>\n\t\t\t\t\t\t\t\t<td>35</td>\n\t\t\t\t\t\t\t</tr>\n\t\t\t\t\t\t\t<tr>\n\t\t\t\t\t\t\t\t<td>10</td>\n\t\t\t\t\t\t\t\t<td>40</td>\n\t\t\t\t\t\t\t</tr>\n\t\t\t\t\t\t\t<tr>\n\t\t\t\t\t\t\t\t<td>15</td>\n\t\t\t\t\t\t\t\t<td>45</td>\n\t\t\t\t\t\t\t</tr>\n\t\t\t\t\t\t\t<tr>\n\t\t\t\t\t\t\t\t<td>20</td>\n\t\t\t\t\t\t\t\t<td>50</td>\n\t\t\t\t\t\t\t</tr>\n\t\t\t\t\t\t\t<tr>\n\t\t\t\t\t\t\t\t<td>25</td>\n\t\t\t\t\t\t\t\t<td>55</td>\n\t\t\t\t\t\t\t</tr>\n\t\t\t\t\t\t</tbody>\n\t\t\t\t\t</table>\n\t\t\t\t</td>\n\t\t\t</tr>\n\t\t\t<tr>\n\t\t\t\t<td class=\"cornerBottomLeft\">&nbsp;</td>\n\t\t\t\t<td valign=\"top\" class=\"timeOptions\">\n\t\t\t\t\t<table class=\"amPmContainer\">\n\t\t\t\t\t\t<tbody dojoAttachPoint=\"amPmContainerNode\" \n\t\t\t\t\t\t\tdojoAttachEvent=\"onClick: onSetSelectedAmPm;\">\n\t\t\t\t\t\t\t<tr>\n\t\t\t\t\t\t\t\t<td id=\"am\">${this.calendar.am}</td>\n\t\t\t\t\t\t\t\t<td id=\"pm\">${this.calendar.pm}</td>\n\t\t\t\t\t\t\t</tr>\n\t\t\t\t\t\t</tbody>\n\t\t\t\t\t</table>\n\t\t\t\t</td>\n\t\t\t\t<td class=\"timeOptions\">\n\t\t\t\t\t<div dojoAttachPoint=\"anyTimeContainerNode\" \n\t\t\t\t\t\tdojoAttachEvent=\"onClick: onSetSelectedAnyTime;\" \n\t\t\t\t\t\tclass=\"anyTimeContainer\">${this.widgetStrings.any}</div>\n\t\t\t\t</td>\n\t\t\t\t<td class=\"cornerBottomRight\">&nbsp;</td>\n\t\t\t</tr>\n\t\t</tbody>\n\t</table>\n</div>\n",templateCssString:"/*Time Picker */\n.timePickerContainer {\n\twidth:122px;\n\tfont-family:Tahoma, Myriad, Helvetica, Arial, Verdana, sans-serif;\n\tfont-size:16px;\n}\n\n.timeContainer {\n\tborder-collapse:collapse;\n\tborder-spacing:0;\n}\n\n.timeContainer thead {\n\tcolor:#293a4b;\n\tfont-size:0.9em;\n\tfont-weight:700;\n}\n\n.timeContainer thead td {\n\tpadding:0.25em;\n\tfont-size:0.80em;\n\tborder-bottom:1px solid #6782A8;\n}\n\n.timeCorner {\n\twidth:10px;\n}\n\n.cornerTopLeft {\n\tbackground: url(\"images/dpCurveTL.png\") top left no-repeat;\n}\n\n.cornerTopRight {\n\tbackground: url(\"images/dpCurveTR.png\") top right no-repeat;\n}\n\n.timeLabelContainer {\n\tbackground: url(\"images/dpMonthBg.png\") top left repeat-x;\n}\n\n.hours, .minutes, .timeBorder {\n\tbackground: #7591bc url(\"images/dpBg.gif\") top left repeat-x;\n\n}\n\n.hours td, .minutes td {\n\tpadding:0.2em;\n\ttext-align:center;\n\tfont-size:0.7em;\n\tfont-weight:bold;\n\tcursor:pointer;\n\tcursor:hand;\n\tcolor:#fff;\n}\n\n.minutes {\n\tborder-left:1px solid #f5d1db;\n}\n\n.hours {\n\tborder-right:1px solid #6782A8;\n}\n\n.hourSelector {\n\tborder-right:1px solid #6782A8;\n\tpadding:5px;\n\tpadding-right:10px;\n}\n\n.minutesSelector {\n\tpadding:5px;\n\tborder-left:1px solid #f5c7d4;\n\ttext-align:center;\n}\n\n.minutesHeading {\n\tpadding-left:9px !important;\n}\n\n.timeOptions {\n\tbackground-color:#F9C9D7;\n}\n\n.timeContainer .cornerBottomLeft, .timeContainer .cornerBottomRight, .timeContainer .timeOptions {\n\tborder-top:1px solid #6782A8;\n}\n\n.timeContainer .cornerBottomLeft {\n\tbackground: url(\"images/dpCurveBL.png\") bottom left no-repeat !important;\n\twidth:9px !important;\n\tpadding:0;\n\tmargin:0;\n}\n\n.timeContainer .cornerBottomRight {\n\tbackground: url(\"images/dpCurveBR.png\") bottom right no-repeat !important;\n\twidth:9px !important;\n\tpadding:0;\n\tmargin:0;\n}\n\n.timeOptions {\n\tcolor:#fff;\n\tbackground:url(\"images/dpYearBg.png\") top left repeat-x;\n\n}\n\n.selectedItem {\n\tbackground-color:#fff;\n\tcolor:#6782a8 !important;\n}\n\n.timeOptions .selectedItem {\n\tcolor:#fff !important;\n\tbackground-color:#9ec3fb !important;\n}\n\n.anyTimeContainer {\n\ttext-align:center;\n\tfont-weight:bold;\n\tfont-size:0.7em;\n\tpadding:0.1em;\n\tcursor:pointer;\n\tcursor:hand;\n\tcolor:#fff !important;\n}\n\n.amPmContainer {\n\twidth:100%;\n}\n\n.amPmContainer td {\n\ttext-align:center;\n\tfont-size:0.7em;\n\tfont-weight:bold;\n\tcursor:pointer;\n\tcursor:hand;\n\tcolor:#fff;\n}\n\n\n\n/*.timePickerContainer {\n\tmargin:1.75em 0 0.5em 0;\n\twidth:10em;\n\tfloat:left;\n}\n\n.timeContainer {\n\tborder-collapse:collapse;\n\tborder-spacing:0;\n}\n\n.timeContainer thead td{\n\tborder-bottom:1px solid #e6e6e6;\n\tpadding:0 0.4em 0.2em 0.4em;\n}\n\n.timeContainer td {\n\tfont-size:0.9em;\n\tpadding:0 0.25em 0 0.25em;\n\ttext-align:left;\n\tcursor:pointer;cursor:hand;\n}\n\n.timeContainer td.minutesHeading {\n\tborder-left:1px solid #e6e6e6;\n\tborder-right:1px solid #e6e6e6;\t\n}\n\n.timeContainer .minutes {\n\tborder-left:1px solid #e6e6e6;\n\tborder-right:1px solid #e6e6e6;\n}\n\n.selectedItem {\n\tbackground-color:#3a3a3a;\n\tcolor:#ffffff;\n}*/\n",templateCssPath:dojo.uri.moduleUri("dojo.widget","templates/TimePicker.css"),postMixInProperties:function(_da3,frag){
+},{isContainer:false,templateString:"<div class=\"timePickerContainer\" dojoAttachPoint=\"timePickerContainerNode\">\n\t<table class=\"timeContainer\" cellspacing=\"0\" >\n\t\t<thead>\n\t\t\t<tr>\n\t\t\t\t<td class=\"timeCorner cornerTopLeft\" valign=\"top\">&nbsp;</td>\n\t\t\t\t<td class=\"timeLabelContainer hourSelector\">${this.calendar.field-hour}</td>\n\t\t\t\t<td class=\"timeLabelContainer minutesHeading\">${this.calendar.field-minute}</td>\n\t\t\t\t<td class=\"timeCorner cornerTopRight\" valign=\"top\">&nbsp;</td>\n\t\t\t</tr>\n\t\t</thead>\n\t\t<tbody>\n\t\t\t<tr>\n\t\t\t\t<td valign=\"top\" colspan=\"2\" class=\"hours\">\n\t\t\t\t\t<table align=\"center\">\n\t\t\t\t\t\t<tbody dojoAttachPoint=\"hourContainerNode\"  \n\t\t\t\t\t\t\tdojoAttachEvent=\"onClick: onSetSelectedHour;\">\n\t\t\t\t\t\t\t<tr>\n\t\t\t\t\t\t\t\t<td>12</td>\n\t\t\t\t\t\t\t\t<td>6</td>\n\t\t\t\t\t\t\t</tr>\n\t\t\t\t\t\t\t<tr>\n\t\t\t\t\t\t\t\t<td>1</td>\n\t\t\t\t\t\t\t\t<td>7</td>\n\t\t\t\t\t\t\t</tr>\n\t\t\t\t\t\t\t<tr>\n\t\t\t\t\t\t\t\t<td>2</td>\n\t\t\t\t\t\t\t\t<td>8</td>\n\t\t\t\t\t\t\t</tr>\n\t\t\t\t\t\t\t<tr>\n\t\t\t\t\t\t\t\t<td>3</td>\n\t\t\t\t\t\t\t\t<td>9</td>\n\t\t\t\t\t\t\t</tr>\n\t\t\t\t\t\t\t<tr>\n\t\t\t\t\t\t\t\t<td>4</td>\n\t\t\t\t\t\t\t\t<td>10</td>\n\t\t\t\t\t\t\t</tr>\n\t\t\t\t\t\t\t<tr>\n\t\t\t\t\t\t\t\t<td>5</td>\n\t\t\t\t\t\t\t\t<td>11</td>\n\t\t\t\t\t\t\t</tr>\n\t\t\t\t\t\t</tbody>\n\t\t\t\t\t</table>\n\t\t\t\t</td>\n\t\t\t\t<td valign=\"top\" class=\"minutes\" colspan=\"2\">\n\t\t\t\t\t<table align=\"center\">\n\t\t\t\t\t\t<tbody dojoAttachPoint=\"minuteContainerNode\" \n\t\t\t\t\t\t\tdojoAttachEvent=\"onClick: onSetSelectedMinute;\">\n\t\t\t\t\t\t\t<tr>\n\t\t\t\t\t\t\t\t<td>00</td>\n\t\t\t\t\t\t\t\t<td>30</td>\n\t\t\t\t\t\t\t</tr>\n\t\t\t\t\t\t\t<tr>\n\t\t\t\t\t\t\t\t<td>05</td>\n\t\t\t\t\t\t\t\t<td>35</td>\n\t\t\t\t\t\t\t</tr>\n\t\t\t\t\t\t\t<tr>\n\t\t\t\t\t\t\t\t<td>10</td>\n\t\t\t\t\t\t\t\t<td>40</td>\n\t\t\t\t\t\t\t</tr>\n\t\t\t\t\t\t\t<tr>\n\t\t\t\t\t\t\t\t<td>15</td>\n\t\t\t\t\t\t\t\t<td>45</td>\n\t\t\t\t\t\t\t</tr>\n\t\t\t\t\t\t\t<tr>\n\t\t\t\t\t\t\t\t<td>20</td>\n\t\t\t\t\t\t\t\t<td>50</td>\n\t\t\t\t\t\t\t</tr>\n\t\t\t\t\t\t\t<tr>\n\t\t\t\t\t\t\t\t<td>25</td>\n\t\t\t\t\t\t\t\t<td>55</td>\n\t\t\t\t\t\t\t</tr>\n\t\t\t\t\t\t</tbody>\n\t\t\t\t\t</table>\n\t\t\t\t</td>\n\t\t\t</tr>\n\t\t\t<tr>\n\t\t\t\t<td class=\"cornerBottomLeft\">&nbsp;</td>\n\t\t\t\t<td valign=\"top\" class=\"timeOptions\">\n\t\t\t\t\t<table class=\"amPmContainer\">\n\t\t\t\t\t\t<tbody dojoAttachPoint=\"amPmContainerNode\" \n\t\t\t\t\t\t\tdojoAttachEvent=\"onClick: onSetSelectedAmPm;\">\n\t\t\t\t\t\t\t<tr>\n\t\t\t\t\t\t\t\t<td id=\"am\">${this.calendar.am}</td>\n\t\t\t\t\t\t\t\t<td id=\"pm\">${this.calendar.pm}</td>\n\t\t\t\t\t\t\t</tr>\n\t\t\t\t\t\t</tbody>\n\t\t\t\t\t</table>\n\t\t\t\t</td>\n\t\t\t\t<td class=\"timeOptions\">\n\t\t\t\t\t<div dojoAttachPoint=\"anyTimeContainerNode\" \n\t\t\t\t\t\tdojoAttachEvent=\"onClick: onSetSelectedAnyTime;\" \n\t\t\t\t\t\tclass=\"anyTimeContainer\">${this.widgetStrings.any}</div>\n\t\t\t\t</td>\n\t\t\t\t<td class=\"cornerBottomRight\">&nbsp;</td>\n\t\t\t</tr>\n\t\t</tbody>\n\t</table>\n</div>\n",templateCssString:"/*Time Picker */\n.timePickerContainer {\n\twidth:122px;\n\tfont-family:Tahoma, Myriad, Helvetica, Arial, Verdana, sans-serif;\n\tfont-size:16px;\n}\n\n.timeContainer {\n\tborder-collapse:collapse;\n\tborder-spacing:0;\n}\n\n.timeContainer thead {\n\tcolor:#293a4b;\n\tfont-size:0.9em;\n\tfont-weight:700;\n}\n\n.timeContainer thead td {\n\tpadding:0.25em;\n\tfont-size:0.80em;\n\tborder-bottom:1px solid #6782A8;\n}\n\n.timeCorner {\n\twidth:10px;\n}\n\n.cornerTopLeft {\n\tbackground: url(\"images/dpCurveTL.png\") top left no-repeat;\n}\n\n.cornerTopRight {\n\tbackground: url(\"images/dpCurveTR.png\") top right no-repeat;\n}\n\n.timeLabelContainer {\n\tbackground: url(\"images/dpMonthBg.png\") top left repeat-x;\n}\n\n.hours, .minutes, .timeBorder {\n\tbackground: #7591bc url(\"images/dpBg.gif\") top left repeat-x;\n\n}\n\n.hours td, .minutes td {\n\tpadding:0.2em;\n\ttext-align:center;\n\tfont-size:0.7em;\n\tfont-weight:bold;\n\tcursor:pointer;\n\tcursor:hand;\n\tcolor:#fff;\n}\n\n.minutes {\n\tborder-left:1px solid #f5d1db;\n}\n\n.hours {\n\tborder-right:1px solid #6782A8;\n}\n\n.hourSelector {\n\tborder-right:1px solid #6782A8;\n\tpadding:5px;\n\tpadding-right:10px;\n}\n\n.minutesSelector {\n\tpadding:5px;\n\tborder-left:1px solid #f5c7d4;\n\ttext-align:center;\n}\n\n.minutesHeading {\n\tpadding-left:9px !important;\n}\n\n.timeOptions {\n\tbackground-color:#F9C9D7;\n}\n\n.timeContainer .cornerBottomLeft, .timeContainer .cornerBottomRight, .timeContainer .timeOptions {\n\tborder-top:1px solid #6782A8;\n}\n\n.timeContainer .cornerBottomLeft {\n\tbackground: url(\"images/dpCurveBL.png\") bottom left no-repeat !important;\n\twidth:9px !important;\n\tpadding:0;\n\tmargin:0;\n}\n\n.timeContainer .cornerBottomRight {\n\tbackground: url(\"images/dpCurveBR.png\") bottom right no-repeat !important;\n\twidth:9px !important;\n\tpadding:0;\n\tmargin:0;\n}\n\n.timeOptions {\n\tcolor:#fff;\n\tbackground:url(\"images/dpYearBg.png\") top left repeat-x;\n\n}\n\n.selectedItem {\n\tbackground-color:#fff;\n\tcolor:#6782a8 !important;\n}\n\n.timeOptions .selectedItem {\n\tcolor:#fff !important;\n\tbackground-color:#9ec3fb !important;\n}\n\n.anyTimeContainer {\n\ttext-align:center;\n\tfont-weight:bold;\n\tfont-size:0.7em;\n\tpadding:0.1em;\n\tcursor:pointer;\n\tcursor:hand;\n\tcolor:#fff !important;\n}\n\n.amPmContainer {\n\twidth:100%;\n}\n\n.amPmContainer td {\n\ttext-align:center;\n\tfont-size:0.7em;\n\tfont-weight:bold;\n\tcursor:pointer;\n\tcursor:hand;\n\tcolor:#fff;\n}\n\n\n\n/*.timePickerContainer {\n\tmargin:1.75em 0 0.5em 0;\n\twidth:10em;\n\tfloat:left;\n}\n\n.timeContainer {\n\tborder-collapse:collapse;\n\tborder-spacing:0;\n}\n\n.timeContainer thead td{\n\tborder-bottom:1px solid #e6e6e6;\n\tpadding:0 0.4em 0.2em 0.4em;\n}\n\n.timeContainer td {\n\tfont-size:0.9em;\n\tpadding:0 0.25em 0 0.25em;\n\ttext-align:left;\n\tcursor:pointer;cursor:hand;\n}\n\n.timeContainer td.minutesHeading {\n\tborder-left:1px solid #e6e6e6;\n\tborder-right:1px solid #e6e6e6;\t\n}\n\n.timeContainer .minutes {\n\tborder-left:1px solid #e6e6e6;\n\tborder-right:1px solid #e6e6e6;\n}\n\n.selectedItem {\n\tbackground-color:#3a3a3a;\n\tcolor:#ffffff;\n}*/\n",templateCssPath:dojo.uri.moduleUri("dojo.widget","templates/TimePicker.css"),postMixInProperties:function(_db0,frag){
 dojo.widget.TimePicker.superclass.postMixInProperties.apply(this,arguments);
 this.calendar=dojo.i18n.getLocalization("dojo.i18n.calendar","gregorian",this.lang);
 this.widgetStrings=dojo.i18n.getLocalization("dojo.widget","TimePicker",this.lang);
 },fillInTemplate:function(args,frag){
-var _da7=this.getFragNodeRef(frag);
-dojo.html.copyStyle(this.domNode,_da7);
+var _db4=this.getFragNodeRef(frag);
+dojo.html.copyStyle(this.domNode,_db4);
 if(args.value){
 if(args.value instanceof Date){
 this.storedTime=dojo.date.toRfc3339(args.value);
@@ -16380,13 +16426,13 @@ this.time=dojo.widget.TimePicker.util.fromRfcDateTime("",0,1);
 }
 },initUI:function(){
 if(!this.selectedTime.anyTime&&this.time){
-var _da8=dojo.widget.TimePicker.util.toAmPmHour(this.time.getHours());
-var hour=_da8[0];
-var isAm=_da8[1];
-var _dab=this.time.getMinutes();
-var _dac=parseInt(_dab/5);
+var _db5=dojo.widget.TimePicker.util.toAmPmHour(this.time.getHours());
+var hour=_db5[0];
+var isAm=_db5[1];
+var _db8=this.time.getMinutes();
+var _db9=parseInt(_db8/5);
 this.onSetSelectedHour(this.hourIndexMap[hour]);
-this.onSetSelectedMinute(this.minuteIndexMap[_dac]);
+this.onSetSelectedMinute(this.minuteIndexMap[_db9]);
 this.onSetSelectedAmPm(isAm);
 }else{
 this.onSetSelectedAnyTime();
@@ -16400,8 +16446,8 @@ this.selectedTime.anyTime=true;
 }
 this.initData();
 this.initUI();
-},setDateTime:function(_dae){
-this.storedTime=_dae;
+},setDateTime:function(_dbb){
+this.storedTime=_dbb;
 },onClearSelectedHour:function(evt){
 this.clearSelectedHour();
 },onClearSelectedMinute:function(evt){
@@ -16416,19 +16462,19 @@ this.time=dojo.widget.TimePicker.util.fromRfcDateTime("",this.useDefaultMinutes)
 this.initUI();
 }
 },clearSelectedHour:function(){
-var _db3=this.hourContainerNode.getElementsByTagName("td");
-for(var i=0;i<_db3.length;i++){
-dojo.html.setClass(_db3.item(i),"");
+var _dc0=this.hourContainerNode.getElementsByTagName("td");
+for(var i=0;i<_dc0.length;i++){
+dojo.html.setClass(_dc0.item(i),"");
 }
 },clearSelectedMinute:function(){
-var _db5=this.minuteContainerNode.getElementsByTagName("td");
-for(var i=0;i<_db5.length;i++){
-dojo.html.setClass(_db5.item(i),"");
+var _dc2=this.minuteContainerNode.getElementsByTagName("td");
+for(var i=0;i<_dc2.length;i++){
+dojo.html.setClass(_dc2.item(i),"");
 }
 },clearSelectedAmPm:function(){
-var _db7=this.amPmContainerNode.getElementsByTagName("td");
-for(var i=0;i<_db7.length;i++){
-dojo.html.setClass(_db7.item(i),"");
+var _dc4=this.amPmContainerNode.getElementsByTagName("td");
+for(var i=0;i<_dc4.length;i++){
+dojo.html.setClass(_dc4.item(i),"");
 }
 },clearSelectedAnyTime:function(){
 dojo.html.setClass(this.anyTimeContainerNode,"anyTimeContainer");
@@ -16440,19 +16486,19 @@ this.onSetTime();
 },setSelectedHour:function(evt){
 if(evt&&evt.target){
 if(evt.target.nodeType==dojo.dom.ELEMENT_NODE){
-var _dbb=evt.target;
+var _dc8=evt.target;
 }else{
-var _dbb=evt.target.parentNode;
+var _dc8=evt.target.parentNode;
 }
 dojo.event.browser.stopEvent(evt);
-dojo.html.setClass(_dbb,this.classNames.selectedTime);
-this.selectedTime["hour"]=_dbb.innerHTML;
+dojo.html.setClass(_dc8,this.classNames.selectedTime);
+this.selectedTime["hour"]=_dc8.innerHTML;
 }else{
 if(!isNaN(evt)){
-var _dbc=this.hourContainerNode.getElementsByTagName("td");
-if(_dbc.item(evt)){
-dojo.html.setClass(_dbc.item(evt),this.classNames.selectedTime);
-this.selectedTime["hour"]=_dbc.item(evt).innerHTML;
+var _dc9=this.hourContainerNode.getElementsByTagName("td");
+if(_dc9.item(evt)){
+dojo.html.setClass(_dc9.item(evt),this.classNames.selectedTime);
+this.selectedTime["hour"]=_dc9.item(evt).innerHTML;
 }
 }
 }
@@ -16466,19 +16512,19 @@ this.onSetTime();
 },setSelectedMinute:function(evt){
 if(evt&&evt.target){
 if(evt.target.nodeType==dojo.dom.ELEMENT_NODE){
-var _dbf=evt.target;
+var _dcc=evt.target;
 }else{
-var _dbf=evt.target.parentNode;
+var _dcc=evt.target.parentNode;
 }
 dojo.event.browser.stopEvent(evt);
-dojo.html.setClass(_dbf,this.classNames.selectedTime);
-this.selectedTime["minute"]=_dbf.innerHTML;
+dojo.html.setClass(_dcc,this.classNames.selectedTime);
+this.selectedTime["minute"]=_dcc.innerHTML;
 }else{
 if(!isNaN(evt)){
-var _dc0=this.minuteContainerNode.getElementsByTagName("td");
-if(_dc0.item(evt)){
-dojo.html.setClass(_dc0.item(evt),this.classNames.selectedTime);
-this.selectedTime["minute"]=_dc0.item(evt).innerHTML;
+var _dcd=this.minuteContainerNode.getElementsByTagName("td");
+if(_dcd.item(evt)){
+dojo.html.setClass(_dcd.item(evt),this.classNames.selectedTime);
+this.selectedTime["minute"]=_dcd.item(evt).innerHTML;
 }
 }
 }
@@ -16489,20 +16535,20 @@ this.setSelectedAmPm(evt);
 this.selectedTime.anyTime=false;
 this.onSetTime();
 },setSelectedAmPm:function(evt){
-var _dc3=evt.target;
-if(evt&&_dc3){
-if(_dc3.nodeType!=dojo.dom.ELEMENT_NODE){
-_dc3=_dc3.parentNode;
+var _dd0=evt.target;
+if(evt&&_dd0){
+if(_dd0.nodeType!=dojo.dom.ELEMENT_NODE){
+_dd0=_dd0.parentNode;
 }
 dojo.event.browser.stopEvent(evt);
-this.selectedTime.amPm=_dc3.id;
-dojo.html.setClass(_dc3,this.classNames.selectedTime);
+this.selectedTime.amPm=_dd0.id;
+dojo.html.setClass(_dd0,this.classNames.selectedTime);
 }else{
 evt=evt?0:1;
-var _dc4=this.amPmContainerNode.getElementsByTagName("td");
-if(_dc4.item(evt)){
-this.selectedTime.amPm=_dc4.item(evt).id;
-dojo.html.setClass(_dc4.item(evt),this.classNames.selectedTime);
+var _dd1=this.amPmContainerNode.getElementsByTagName("td");
+if(_dd1.item(evt)){
+this.selectedTime.amPm=_dd1.item(evt).id;
+dojo.html.setClass(_dd1.item(evt),this.classNames.selectedTime);
 }
 }
 },onSetSelectedAnyTime:function(evt){
@@ -16519,72 +16565,72 @@ dojo.event.browser.stopEvent(evt);
 },onSetTime:function(){
 if(this.selectedTime.anyTime){
 this.time=new Date();
-var _dc8=dojo.widget.TimePicker.util.toRfcDateTime(this.time);
-this.setDateTime(_dc8.split("T")[0]);
+var _dd5=dojo.widget.TimePicker.util.toRfcDateTime(this.time);
+this.setDateTime(_dd5.split("T")[0]);
 }else{
 var hour=12;
-var _dca=0;
+var _dd7=0;
 var isAm=false;
 if(this.selectedTime["hour"]){
 hour=parseInt(this.selectedTime["hour"],10);
 }
 if(this.selectedTime["minute"]){
-_dca=parseInt(this.selectedTime["minute"],10);
+_dd7=parseInt(this.selectedTime["minute"],10);
 }
 if(this.selectedTime["amPm"]){
 isAm=(this.selectedTime["amPm"].toLowerCase()=="am");
 }
 this.time=new Date();
 this.time.setHours(dojo.widget.TimePicker.util.fromAmPmHour(hour,isAm));
-this.time.setMinutes(_dca);
+this.time.setMinutes(_dd7);
 this.setDateTime(dojo.widget.TimePicker.util.toRfcDateTime(this.time));
 }
 this.onValueChanged(this.time);
 },onValueChanged:function(date){
 }});
 dojo.widget.TimePicker.util=new function(){
-this.toRfcDateTime=function(_dcd){
-if(!_dcd){
-_dcd=new Date();
+this.toRfcDateTime=function(_dda){
+if(!_dda){
+_dda=new Date();
 }
-_dcd.setSeconds(0);
-return dojo.date.strftime(_dcd,"%Y-%m-%dT%H:%M:00%z");
+_dda.setSeconds(0);
+return dojo.date.strftime(_dda,"%Y-%m-%dT%H:%M:00%z");
 };
-this.fromRfcDateTime=function(_dce,_dcf,_dd0){
-var _dd1=new Date();
-if(!_dce||_dce.indexOf("T")==-1){
-if(_dcf){
-_dd1.setMinutes(Math.floor(_dd1.getMinutes()/5)*5);
+this.fromRfcDateTime=function(_ddb,_ddc,_ddd){
+var _dde=new Date();
+if(!_ddb||_ddb.indexOf("T")==-1){
+if(_ddc){
+_dde.setMinutes(Math.floor(_dde.getMinutes()/5)*5);
 }else{
-_dd1.setMinutes(0);
+_dde.setMinutes(0);
 }
 }else{
-var _dd2=_dce.split("T")[1].split(":");
-var _dd1=new Date();
-_dd1.setHours(_dd2[0]);
-_dd1.setMinutes(_dd2[1]);
+var _ddf=_ddb.split("T")[1].split(":");
+var _dde=new Date();
+_dde.setHours(_ddf[0]);
+_dde.setMinutes(_ddf[1]);
 }
-return _dd1;
+return _dde;
 };
 this.toAmPmHour=function(hour){
-var _dd4=hour;
+var _de1=hour;
 var isAm=true;
-if(_dd4==0){
-_dd4=12;
+if(_de1==0){
+_de1=12;
 }else{
-if(_dd4>12){
-_dd4=_dd4-12;
+if(_de1>12){
+_de1=_de1-12;
 isAm=false;
 }else{
-if(_dd4==12){
+if(_de1==12){
 isAm=false;
 }
 }
 }
-return [_dd4,isAm];
+return [_de1,isAm];
 };
-this.fromAmPmHour=function(_dd6,isAm){
-var hour=parseInt(_dd6,10);
+this.fromAmPmHour=function(_de3,isAm){
+var hour=parseInt(_de3,10);
 if(isAm&&hour==12){
 hour=0;
 }else{
@@ -16598,8 +16644,8 @@ return hour;
 dojo.provide("dojo.widget.DropdownTimePicker");
 dojo.widget.defineWidget("dojo.widget.DropdownTimePicker",dojo.widget.DropdownContainer,{iconURL:dojo.uri.moduleUri("dojo.widget","templates/images/timeIcon.gif"),formatLength:"short",displayFormat:"",timeFormat:"",saveFormat:"",value:"",name:"",postMixInProperties:function(){
 dojo.widget.DropdownTimePicker.superclass.postMixInProperties.apply(this,arguments);
-var _dd9=dojo.i18n.getLocalization("dojo.widget","DropdownTimePicker",this.lang);
-this.iconAlt=_dd9.selectTime;
+var _de6=dojo.i18n.getLocalization("dojo.widget","DropdownTimePicker",this.lang);
+this.iconAlt=_de6.selectTime;
 if(typeof (this.value)=="string"&&this.value.toLowerCase()=="today"){
 this.value=new Date();
 }
@@ -16624,9 +16670,9 @@ this.value=new Date(this.value);
 }
 },fillInTemplate:function(){
 dojo.widget.DropdownTimePicker.superclass.fillInTemplate.apply(this,arguments);
-var _dde="";
+var _deb="";
 if(this.value instanceof Date){
-_dde=this.value;
+_deb=this.value;
 }else{
 if(this.value){
 var orig=this.value;
@@ -16638,11 +16684,11 @@ c[i]="0"+c[i];
 }
 }
 orig=c.join(":");
-_dde=dojo.date.fromRfc3339(d+"T"+orig);
+_deb=dojo.date.fromRfc3339(d+"T"+orig);
 }
 }
-var _de3={widgetContainerId:this.widgetId,lang:this.lang,value:_dde};
-this.timePicker=dojo.widget.createWidget("TimePicker",_de3,this.containerNode,"child");
+var _df0={widgetContainerId:this.widgetId,lang:this.lang,value:_deb};
+this.timePicker=dojo.widget.createWidget("TimePicker",_df0,this.containerNode,"child");
 dojo.event.connect(this.timePicker,"onValueChanged",this,"_updateText");
 if(this.value){
 this._updateText();
@@ -16654,12 +16700,12 @@ this.valueNode.name=this.name;
 return this.valueNode.value;
 },getTime:function(){
 return this.timePicker.storedTime;
-},setValue:function(_de4){
-this.setTime(_de4);
-},setTime:function(_de5){
-var _de6="";
-if(_de5 instanceof Date){
-_de6=_de5;
+},setValue:function(_df1){
+this.setTime(_df1);
+},setTime:function(_df2){
+var _df3="";
+if(_df2 instanceof Date){
+_df3=_df2;
 }else{
 if(this.value){
 var orig=this.value;
@@ -16671,10 +16717,10 @@ c[i]="0"+c[i];
 }
 }
 orig=c.join(":");
-_de6=dojo.date.fromRfc3339(d+"T"+orig);
+_df3=dojo.date.fromRfc3339(d+"T"+orig);
 }
 }
-this.timePicker.setTime(_de6);
+this.timePicker.setTime(_df3);
 this._syncValueNode();
 },_updateText:function(){
 if(this.timePicker.selectedTime.anyTime){
@@ -16690,43 +16736,43 @@ this.inputNode.value=dojo.date.format(this.timePicker.time,{formatLength:this.fo
 this._syncValueNode();
 this.onValueChanged(this.getTime());
 this.hideContainer();
-},onValueChanged:function(_deb){
+},onValueChanged:function(_df8){
 },onInputChange:function(){
 if(this.dateFormat){
 dojo.deprecated("dojo.widget.DropdownTimePicker","Cannot parse user input.  Must use displayFormat attribute instead of dateFormat.  See dojo.date.format for specification.","0.5");
 }else{
-var _dec=dojo.string.trim(this.inputNode.value);
-if(_dec){
-var _ded=dojo.date.parse(_dec,{formatLength:this.formatLength,timePattern:this.displayFormat,selector:"timeOnly",locale:this.lang});
-if(_ded){
-this.setTime(_ded);
+var _df9=dojo.string.trim(this.inputNode.value);
+if(_df9){
+var _dfa=dojo.date.parse(_df9,{formatLength:this.formatLength,timePattern:this.displayFormat,selector:"timeOnly",locale:this.lang});
+if(_dfa){
+this.setTime(_dfa);
 }
 }else{
-this.valueNode.value=_dec;
+this.valueNode.value=_df9;
 }
 }
-if(_dec){
+if(_df9){
 this._updateText();
 }
 },_syncValueNode:function(){
 var time=this.timePicker.time;
-var _def;
+var _dfc;
 switch(this.saveFormat.toLowerCase()){
 case "rfc":
 case "iso":
 case "":
-_def=dojo.date.toRfc3339(time,"timeOnly");
+_dfc=dojo.date.toRfc3339(time,"timeOnly");
 break;
 case "posix":
 case "unix":
-_def=Number(time);
+_dfc=Number(time);
 break;
 default:
-_def=dojo.date.format(time,{datePattern:this.saveFormat,selector:"timeOnly",locale:this.lang});
+_dfc=dojo.date.format(time,{datePattern:this.saveFormat,selector:"timeOnly",locale:this.lang});
 }
-this.valueNode.value=_def;
-},destroy:function(_df0){
-this.timePicker.destroy(_df0);
+this.valueNode.value=_dfc;
+},destroy:function(_dfd){
+this.timePicker.destroy(_dfd);
 dojo.widget.DropdownTimePicker.superclass.destroy.apply(this,arguments);
 }});
 dojo.provide("struts.widget.StrutsTimePicker");
@@ -16743,29 +16789,29 @@ this.valueNotifyTopicsArray=this.valueNotifyTopics.split(",");
 }
 },_syncValueNode:function(){
 var time=this.timePicker.time;
-var _df2;
+var _dff;
 switch(this.saveFormat.toLowerCase()){
 case "rfc":
 case "iso":
 case "":
-_df2=dojo.date.toRfc3339(time);
+_dff=dojo.date.toRfc3339(time);
 break;
 case "posix":
 case "unix":
-_df2=Number(time);
+_dff=Number(time);
 break;
 default:
-_df2=dojo.date.format(time,{datePattern:this.saveFormat,selector:"timeOnly",locale:this.lang});
+_dff=dojo.date.format(time,{datePattern:this.saveFormat,selector:"timeOnly",locale:this.lang});
 }
-this.valueNode.value=_df2;
+this.valueNode.value=_dff;
 },_updateText:function(){
 struts.widget.StrutsTimePicker.superclass._updateText.apply(this,arguments);
 if(this.valueNotifyTopicsArray!=null){
 for(var i=0;i<this.valueNotifyTopicsArray.length;i++){
-var _df4=this.valueNotifyTopicsArray[i];
-if(!dojo.string.isBlank(_df4)){
+var _e01=this.valueNotifyTopicsArray[i];
+if(!dojo.string.isBlank(_e01)){
 try{
-dojo.event.topic.publish(_df4,this.inputNode.value);
+dojo.event.topic.publish(_e01,this.inputNode.value);
 }
 catch(ex){
 dojo.debug(ex);
@@ -16792,19 +16838,19 @@ this.value.setHours(0,0,0,0);
 }
 },fillInTemplate:function(args,frag){
 dojo.widget.DatePicker.superclass.fillInTemplate.apply(this,arguments);
-var _df7=this.getFragNodeRef(frag);
-dojo.html.copyStyle(this.domNode,_df7);
+var _e04=this.getFragNodeRef(frag);
+dojo.html.copyStyle(this.domNode,_e04);
 this.weekTemplate=dojo.dom.removeNode(this.calendarWeekTemplate);
 this._preInitUI(this.value?this.value:this.today,false,true);
-var _df8=dojo.lang.unnest(dojo.date.getNames("days",this.dayWidth,"standAlone",this.lang));
+var _e05=dojo.lang.unnest(dojo.date.getNames("days",this.dayWidth,"standAlone",this.lang));
 if(this.weekStartsOn>0){
 for(var i=0;i<this.weekStartsOn;i++){
-_df8.push(_df8.shift());
+_e05.push(_e05.shift());
 }
 }
-var _dfa=this.dayLabelsRow.getElementsByTagName("td");
+var _e07=this.dayLabelsRow.getElementsByTagName("td");
 for(i=0;i<7;i++){
-_dfa.item(i).innerHTML=_df8[i];
+_e07.item(i).innerHTML=_e05[i];
 }
 if(this.value){
 this.setValue(this.value);
@@ -16813,18 +16859,18 @@ this.setValue(this.value);
 return dojo.date.toRfc3339(new Date(this.value),"dateOnly");
 },getDate:function(){
 return this.value;
-},setValue:function(_dfb){
-this.setDate(_dfb);
-},setDate:function(_dfc){
-if(_dfc==""){
+},setValue:function(_e08){
+this.setDate(_e08);
+},setDate:function(_e09){
+if(_e09==""){
 this.value="";
 this._preInitUI(this.curMonth,false,true);
 }else{
-if(typeof _dfc=="string"){
-this.value=dojo.date.fromRfc3339(_dfc);
+if(typeof _e09=="string"){
+this.value=dojo.date.fromRfc3339(_e09);
 this.value.setHours(0,0,0,0);
 }else{
-this.value=new Date(_dfc);
+this.value=new Date(_e09);
 this.value.setHours(0,0,0,0);
 }
 }
@@ -16840,7 +16886,7 @@ this._preInitUI(this.value,false,true);
 }
 this.clickedNode=null;
 this.onValueChanged(this.value);
-},_preInitUI:function(_dfd,_dfe,_dff){
+},_preInitUI:function(_e0a,_e0b,_e0c){
 if(typeof (this.startDate)=="string"){
 this.startDate=dojo.date.fromRfc3339(this.startDate);
 }
@@ -16849,16 +16895,16 @@ this.endDate=dojo.date.fromRfc3339(this.endDate);
 }
 this.startDate.setHours(0,0,0,0);
 this.endDate.setHours(24,0,0,-1);
-if(_dfd<this.startDate||_dfd>this.endDate){
-_dfd=new Date((_dfd<this.startDate)?this.startDate:this.endDate);
+if(_e0a<this.startDate||_e0a>this.endDate){
+_e0a=new Date((_e0a<this.startDate)?this.startDate:this.endDate);
 }
-this.firstDay=this._initFirstDay(_dfd,_dfe);
+this.firstDay=this._initFirstDay(_e0a,_e0b);
 this.selectedIsUsed=false;
 this.currentIsUsed=false;
-var _e00=new Date(this.firstDay);
-var _e01=_e00.getMonth();
-this.curMonth=new Date(_e00);
-this.curMonth.setDate(_e00.getDate()+6);
+var _e0d=new Date(this.firstDay);
+var _e0e=_e0d.getMonth();
+this.curMonth=new Date(_e0d);
+this.curMonth.setDate(_e0d.getDate()+6);
 this.curMonth.setDate(1);
 if(this.displayWeeks==""||this.adjustWeeks){
 this.adjustWeeks=true;
@@ -16867,16 +16913,16 @@ this.displayWeeks=Math.ceil((dojo.date.getDaysInMonth(this.curMonth)+this._getAd
 var days=this.displayWeeks*7;
 if(dojo.date.diff(this.startDate,this.endDate,dojo.date.dateParts.DAY)<days){
 this.staticDisplay=true;
-if(dojo.date.diff(_e00,this.endDate,dojo.date.dateParts.DAY)>days){
+if(dojo.date.diff(_e0d,this.endDate,dojo.date.dateParts.DAY)>days){
 this._preInitUI(this.startDate,true,false);
-_e00=new Date(this.firstDay);
+_e0d=new Date(this.firstDay);
 }
-this.curMonth=new Date(_e00);
-this.curMonth.setDate(_e00.getDate()+6);
+this.curMonth=new Date(_e0d);
+this.curMonth.setDate(_e0d.getDate()+6);
 this.curMonth.setDate(1);
-var _e03=(_e00.getMonth()==this.curMonth.getMonth())?"current":"previous";
+var _e10=(_e0d.getMonth()==this.curMonth.getMonth())?"current":"previous";
 }
-if(_dff){
+if(_e0c){
 this._initUI(days);
 }
 },_initUI:function(days){
@@ -16884,72 +16930,72 @@ dojo.dom.removeChildren(this.calendarDatesContainerNode);
 for(var i=0;i<this.displayWeeks;i++){
 this.calendarDatesContainerNode.appendChild(this.weekTemplate.cloneNode(true));
 }
-var _e06=new Date(this.firstDay);
+var _e13=new Date(this.firstDay);
 this._setMonthLabel(this.curMonth.getMonth());
 this._setYearLabels(this.curMonth.getFullYear());
-var _e07=this.calendarDatesContainerNode.getElementsByTagName("td");
-var _e08=this.calendarDatesContainerNode.getElementsByTagName("tr");
-var _e09;
+var _e14=this.calendarDatesContainerNode.getElementsByTagName("td");
+var _e15=this.calendarDatesContainerNode.getElementsByTagName("tr");
+var _e16;
 for(i=0;i<days;i++){
-_e09=_e07.item(i);
-_e09.innerHTML=_e06.getDate();
-_e09.setAttribute("djDateValue",_e06.valueOf());
-var _e0a=(_e06.getMonth()!=this.curMonth.getMonth()&&Number(_e06)<Number(this.curMonth))?"previous":(_e06.getMonth()==this.curMonth.getMonth())?"current":"next";
-var _e0b=_e0a;
-if(this._isDisabledDate(_e06)){
-var _e0c={previous:"disabledPrevious",current:"disabledCurrent",next:"disabledNext"};
-_e0b=_e0c[_e0a];
+_e16=_e14.item(i);
+_e16.innerHTML=_e13.getDate();
+_e16.setAttribute("djDateValue",_e13.valueOf());
+var _e17=(_e13.getMonth()!=this.curMonth.getMonth()&&Number(_e13)<Number(this.curMonth))?"previous":(_e13.getMonth()==this.curMonth.getMonth())?"current":"next";
+var _e18=_e17;
+if(this._isDisabledDate(_e13)){
+var _e19={previous:"disabledPrevious",current:"disabledCurrent",next:"disabledNext"};
+_e18=_e19[_e17];
 }
-dojo.html.setClass(_e09,this._getDateClassName(_e06,_e0b));
-if(dojo.html.hasClass(_e09,this.classNames.selectedDate)){
-this.selectedNode=_e09;
+dojo.html.setClass(_e16,this._getDateClassName(_e13,_e18));
+if(dojo.html.hasClass(_e16,this.classNames.selectedDate)){
+this.selectedNode=_e16;
 }
-_e06=dojo.date.add(_e06,dojo.date.dateParts.DAY,1);
+_e13=dojo.date.add(_e13,dojo.date.dateParts.DAY,1);
 }
-this.lastDay=dojo.date.add(_e06,dojo.date.dateParts.DAY,-1);
+this.lastDay=dojo.date.add(_e13,dojo.date.dateParts.DAY,-1);
 this._initControls();
 },_initControls:function(){
 var d=this.firstDay;
 var d2=this.lastDay;
-var _e0f,_e10,_e11,_e12,_e13,_e14;
-_e0f=_e10=_e11=_e12=_e13=_e14=!this.staticDisplay;
+var _e1c,_e1d,_e1e,_e1f,_e20,_e21;
+_e1c=_e1d=_e1e=_e1f=_e20=_e21=!this.staticDisplay;
 with(dojo.date.dateParts){
 var add=dojo.date.add;
-if(_e0f&&add(d,DAY,(-1*(this._getAdjustedDay(d)+1)))<this.startDate){
-_e0f=_e11=_e13=false;
+if(_e1c&&add(d,DAY,(-1*(this._getAdjustedDay(d)+1)))<this.startDate){
+_e1c=_e1e=_e20=false;
 }
-if(_e10&&d2>this.endDate){
-_e10=_e12=_e14=false;
+if(_e1d&&d2>this.endDate){
+_e1d=_e1f=_e21=false;
 }
-if(_e11&&add(d,DAY,-1)<this.startDate){
-_e11=_e13=false;
+if(_e1e&&add(d,DAY,-1)<this.startDate){
+_e1e=_e20=false;
 }
-if(_e12&&add(d2,DAY,1)>this.endDate){
-_e12=_e14=false;
+if(_e1f&&add(d2,DAY,1)>this.endDate){
+_e1f=_e21=false;
 }
-if(_e13&&add(d2,YEAR,-1)<this.startDate){
-_e13=false;
+if(_e20&&add(d2,YEAR,-1)<this.startDate){
+_e20=false;
 }
-if(_e14&&add(d,YEAR,1)>this.endDate){
-_e14=false;
+if(_e21&&add(d,YEAR,1)>this.endDate){
+_e21=false;
 }
 }
-function enableControl(node,_e17){
-dojo.html.setVisibility(node,_e17?"":"hidden");
+function enableControl(node,_e24){
+dojo.html.setVisibility(node,_e24?"":"hidden");
 }
-enableControl(this.decreaseWeekNode,_e0f);
-enableControl(this.increaseWeekNode,_e10);
-enableControl(this.decreaseMonthNode,_e11);
-enableControl(this.increaseMonthNode,_e12);
-enableControl(this.previousYearLabelNode,_e13);
-enableControl(this.nextYearLabelNode,_e14);
+enableControl(this.decreaseWeekNode,_e1c);
+enableControl(this.increaseWeekNode,_e1d);
+enableControl(this.decreaseMonthNode,_e1e);
+enableControl(this.increaseMonthNode,_e1f);
+enableControl(this.previousYearLabelNode,_e20);
+enableControl(this.nextYearLabelNode,_e21);
 },_incrementWeek:function(evt){
 var d=new Date(this.firstDay);
 switch(evt.target){
 case this.increaseWeekNode.getElementsByTagName("img").item(0):
 case this.increaseWeekNode:
-var _e1a=dojo.date.add(d,dojo.date.dateParts.WEEK,1);
-if(_e1a<this.endDate){
+var _e27=dojo.date.add(d,dojo.date.dateParts.WEEK,1);
+if(_e27<this.endDate){
 d=dojo.date.add(d,dojo.date.dateParts.WEEK,1);
 }
 break;
@@ -16963,60 +17009,60 @@ break;
 this._preInitUI(d,true,true);
 },_incrementMonth:function(evt){
 var d=new Date(this.curMonth);
-var _e1d=new Date(this.firstDay);
+var _e2a=new Date(this.firstDay);
 switch(evt.currentTarget){
 case this.increaseMonthNode.getElementsByTagName("img").item(0):
 case this.increaseMonthNode:
-_e1d=dojo.date.add(_e1d,dojo.date.dateParts.DAY,this.displayWeeks*7);
-if(_e1d<this.endDate){
+_e2a=dojo.date.add(_e2a,dojo.date.dateParts.DAY,this.displayWeeks*7);
+if(_e2a<this.endDate){
 d=dojo.date.add(d,dojo.date.dateParts.MONTH,1);
 }else{
-var _e1e=true;
+var _e2b=true;
 }
 break;
 case this.decreaseMonthNode.getElementsByTagName("img").item(0):
 case this.decreaseMonthNode:
-if(_e1d>this.startDate){
+if(_e2a>this.startDate){
 d=dojo.date.add(d,dojo.date.dateParts.MONTH,-1);
 }else{
-var _e1f=true;
+var _e2c=true;
 }
 break;
 }
-if(_e1f){
+if(_e2c){
 d=new Date(this.startDate);
 }else{
-if(_e1e){
+if(_e2b){
 d=new Date(this.endDate);
 }
 }
 this._preInitUI(d,false,true);
 },_incrementYear:function(evt){
 var year=this.curMonth.getFullYear();
-var _e22=new Date(this.firstDay);
+var _e2f=new Date(this.firstDay);
 switch(evt.target){
 case this.nextYearLabelNode:
-_e22=dojo.date.add(_e22,dojo.date.dateParts.YEAR,1);
-if(_e22<this.endDate){
+_e2f=dojo.date.add(_e2f,dojo.date.dateParts.YEAR,1);
+if(_e2f<this.endDate){
 year++;
 }else{
-var _e23=true;
+var _e30=true;
 }
 break;
 case this.previousYearLabelNode:
-_e22=dojo.date.add(_e22,dojo.date.dateParts.YEAR,-1);
-if(_e22>this.startDate){
+_e2f=dojo.date.add(_e2f,dojo.date.dateParts.YEAR,-1);
+if(_e2f>this.startDate){
 year--;
 }else{
-var _e24=true;
+var _e31=true;
 }
 break;
 }
 var d;
-if(_e24){
+if(_e31){
 d=new Date(this.startDate);
 }else{
-if(_e23){
+if(_e30){
 d=new Date(this.endDate);
 }else{
 d=new Date(year,this.curMonth.getMonth(),1);
@@ -17038,8 +17084,8 @@ evt.stopPropagation();
 if(!this.staticDisplay){
 this._incrementYear(evt);
 }
-},_setMonthLabel:function(_e29){
-this.monthLabelNode.innerHTML=dojo.date.getNames("months","wide","standAlone",this.lang)[_e29];
+},_setMonthLabel:function(_e36){
+this.monthLabelNode.innerHTML=dojo.date.getNames("months","wide","standAlone",this.lang)[_e36];
 },_setYearLabels:function(year){
 var y=year-1;
 var that=this;
@@ -17049,64 +17095,64 @@ that[n+"YearLabelNode"].innerHTML=dojo.date.format(new Date(y++,0),{formatLength
 f("previous");
 f("current");
 f("next");
-},_getDateClassName:function(date,_e2f){
-var _e30=this.classNames[_e2f];
+},_getDateClassName:function(date,_e3c){
+var _e3d=this.classNames[_e3c];
 if((!this.selectedIsUsed&&this.value)&&(Number(date)==Number(this.value))){
-_e30=this.classNames.selectedDate+" "+_e30;
+_e3d=this.classNames.selectedDate+" "+_e3d;
 this.selectedIsUsed=true;
 }
 if((!this.currentIsUsed)&&(Number(date)==Number(this.today))){
-_e30=_e30+" "+this.classNames.currentDate;
+_e3d=_e3d+" "+this.classNames.currentDate;
 this.currentIsUsed=true;
 }
-return _e30;
+return _e3d;
 },onClick:function(evt){
 dojo.event.browser.stopEvent(evt);
 },_handleUiClick:function(evt){
-var _e33=evt.target;
-if(_e33.nodeType!=dojo.dom.ELEMENT_NODE){
-_e33=_e33.parentNode;
+var _e40=evt.target;
+if(_e40.nodeType!=dojo.dom.ELEMENT_NODE){
+_e40=_e40.parentNode;
 }
 dojo.event.browser.stopEvent(evt);
 this.selectedIsUsed=this.todayIsUsed=false;
-if(dojo.html.hasClass(_e33,this.classNames["disabledPrevious"])||dojo.html.hasClass(_e33,this.classNames["disabledCurrent"])||dojo.html.hasClass(_e33,this.classNames["disabledNext"])){
+if(dojo.html.hasClass(_e40,this.classNames["disabledPrevious"])||dojo.html.hasClass(_e40,this.classNames["disabledCurrent"])||dojo.html.hasClass(_e40,this.classNames["disabledNext"])){
 return;
 }
-this.clickedNode=_e33;
-this.setDate(new Date(Number(dojo.html.getAttribute(_e33,"djDateValue"))));
+this.clickedNode=_e40;
+this.setDate(new Date(Number(dojo.html.getAttribute(_e40,"djDateValue"))));
 },onValueChanged:function(date){
-},_isDisabledDate:function(_e35){
-if(_e35<this.startDate||_e35>this.endDate){
+},_isDisabledDate:function(_e42){
+if(_e42<this.startDate||_e42>this.endDate){
 return true;
 }
-return this.isDisabledDate(_e35,this.lang);
-},isDisabledDate:function(_e36,_e37){
+return this.isDisabledDate(_e42,this.lang);
+},isDisabledDate:function(_e43,_e44){
 return false;
-},_initFirstDay:function(_e38,adj){
-var d=new Date(_e38);
+},_initFirstDay:function(_e45,adj){
+var d=new Date(_e45);
 if(!adj){
 d.setDate(1);
 }
 d.setDate(d.getDate()-this._getAdjustedDay(d,this.weekStartsOn));
 d.setHours(0,0,0,0);
 return d;
-},_getAdjustedDay:function(_e3b){
+},_getAdjustedDay:function(_e48){
 var days=[0,1,2,3,4,5,6];
 if(this.weekStartsOn>0){
 for(var i=0;i<this.weekStartsOn;i++){
 days.unshift(days.pop());
 }
 }
-return days[_e3b.getDay()];
+return days[_e48.getDay()];
 },destroy:function(){
 dojo.widget.DatePicker.superclass.destroy.apply(this,arguments);
 dojo.html.destroyNode(this.weekTemplate);
 }});
 dojo.provide("dojo.widget.DropdownDatePicker");
-dojo.widget.defineWidget("dojo.widget.DropdownDatePicker",dojo.widget.DropdownContainer,{iconURL:dojo.uri.moduleUri("dojo.widget","templates/images/dateIcon.gif"),formatLength:"short",displayFormat:"",saveFormat:"",value:"",name:"",displayWeeks:6,adjustWeeks:false,startDate:"1492-10-12",endDate:"2941-10-12",weekStartsOn:"",staticDisplay:false,postMixInProperties:function(_e3e,frag){
+dojo.widget.defineWidget("dojo.widget.DropdownDatePicker",dojo.widget.DropdownContainer,{iconURL:dojo.uri.moduleUri("dojo.widget","templates/images/dateIcon.gif"),formatLength:"short",displayFormat:"",saveFormat:"",value:"",name:"",displayWeeks:6,adjustWeeks:false,startDate:"1492-10-12",endDate:"2941-10-12",weekStartsOn:"",staticDisplay:false,postMixInProperties:function(_e4b,frag){
 dojo.widget.DropdownDatePicker.superclass.postMixInProperties.apply(this,arguments);
-var _e40=dojo.i18n.getLocalization("dojo.widget","DropdownDatePicker",this.lang);
-this.iconAlt=_e40.selectDate;
+var _e4d=dojo.i18n.getLocalization("dojo.widget","DropdownDatePicker",this.lang);
+this.iconAlt=_e4d.selectDate;
 if(typeof (this.value)=="string"&&this.value.toLowerCase()=="today"){
 this.value=new Date();
 }
@@ -17123,8 +17169,8 @@ this.value=new Date(this.value);
 }
 },fillInTemplate:function(args,frag){
 dojo.widget.DropdownDatePicker.superclass.fillInTemplate.call(this,args,frag);
-var _e44={widgetContainerId:this.widgetId,lang:this.lang,value:this.value,startDate:this.startDate,endDate:this.endDate,displayWeeks:this.displayWeeks,weekStartsOn:this.weekStartsOn,adjustWeeks:this.adjustWeeks,staticDisplay:this.staticDisplay};
-this.datePicker=dojo.widget.createWidget("DatePicker",_e44,this.containerNode,"child");
+var _e51={widgetContainerId:this.widgetId,lang:this.lang,value:this.value,startDate:this.startDate,endDate:this.endDate,displayWeeks:this.displayWeeks,weekStartsOn:this.weekStartsOn,adjustWeeks:this.adjustWeeks,staticDisplay:this.staticDisplay};
+this.datePicker=dojo.widget.createWidget("DatePicker",_e51,this.containerNode,"child");
 dojo.event.connect(this.datePicker,"onValueChanged",this,"_updateText");
 dojo.event.connect(this.inputNode,"onChange",this,"_updateText");
 if(this.value){
@@ -17136,10 +17182,10 @@ this.valueNode.name=this.name;
 return this.valueNode.value;
 },getDate:function(){
 return this.datePicker.value;
-},setValue:function(_e45){
-this.setDate(_e45);
-},setDate:function(_e46){
-this.datePicker.setDate(_e46);
+},setValue:function(_e52){
+this.setDate(_e52);
+},setDate:function(_e53){
+this.datePicker.setDate(_e53);
 this._syncValueNode();
 },_updateText:function(){
 this.inputNode.value=this.datePicker.value?dojo.date.format(this.datePicker.value,{formatLength:this.formatLength,datePattern:this.displayFormat,selector:"dateOnly",locale:this.lang}):"";
@@ -17149,44 +17195,44 @@ this.inputNode.value="";
 this._syncValueNode();
 this.onValueChanged(this.getDate());
 this.hideContainer();
-},onValueChanged:function(_e47){
+},onValueChanged:function(_e54){
 },onInputChange:function(){
-var _e48=dojo.string.trim(this.inputNode.value);
-if(_e48){
-var _e49=dojo.date.parse(_e48,{formatLength:this.formatLength,datePattern:this.displayFormat,selector:"dateOnly",locale:this.lang});
-if(!this.datePicker._isDisabledDate(_e49)){
-this.setDate(_e49);
+var _e55=dojo.string.trim(this.inputNode.value);
+if(_e55){
+var _e56=dojo.date.parse(_e55,{formatLength:this.formatLength,datePattern:this.displayFormat,selector:"dateOnly",locale:this.lang});
+if(!this.datePicker._isDisabledDate(_e56)){
+this.setDate(_e56);
 }
 }else{
-if(_e48==""){
+if(_e55==""){
 this.datePicker.setDate("");
 }
-this.valueNode.value=_e48;
+this.valueNode.value=_e55;
 }
-if(_e48){
+if(_e55){
 this._updateText();
 }
 },_syncValueNode:function(){
 var date=this.datePicker.value;
-var _e4b="";
+var _e58="";
 switch(this.saveFormat.toLowerCase()){
 case "rfc":
 case "iso":
 case "":
-_e4b=dojo.date.toRfc3339(date,"dateOnly");
+_e58=dojo.date.toRfc3339(date,"dateOnly");
 break;
 case "posix":
 case "unix":
-_e4b=Number(date);
+_e58=Number(date);
 break;
 default:
 if(date){
-_e4b=dojo.date.format(date,{datePattern:this.saveFormat,selector:"dateOnly",locale:this.lang});
+_e58=dojo.date.format(date,{datePattern:this.saveFormat,selector:"dateOnly",locale:this.lang});
 }
 }
-this.valueNode.value=_e4b;
-},destroy:function(_e4c){
-this.datePicker.destroy(_e4c);
+this.valueNode.value=_e58;
+},destroy:function(_e59){
+this.datePicker.destroy(_e59);
 dojo.widget.DropdownDatePicker.superclass.destroy.apply(this,arguments);
 }});
 dojo.provide("struts.widget.StrutsDatePicker");
@@ -17203,31 +17249,31 @@ this.valueNotifyTopicsArray=this.valueNotifyTopics.split(",");
 }
 },_syncValueNode:function(){
 var date=this.datePicker.value;
-var _e4e="";
+var _e5b="";
 switch(this.saveFormat.toLowerCase()){
 case "rfc":
 case "iso":
 case "":
-_e4e=dojo.date.toRfc3339(date);
+_e5b=dojo.date.toRfc3339(date);
 break;
 case "posix":
 case "unix":
-_e4e=Number(date);
+_e5b=Number(date);
 break;
 default:
 if(date){
-_e4e=dojo.date.format(date,{datePattern:this.saveFormat,selector:"dateOnly",locale:this.lang});
+_e5b=dojo.date.format(date,{datePattern:this.saveFormat,selector:"dateOnly",locale:this.lang});
 }
 }
-this.valueNode.value=_e4e;
+this.valueNode.value=_e5b;
 },_updateText:function(){
 struts.widget.StrutsDatePicker.superclass._updateText.apply(this,arguments);
 if(this.valueNotifyTopicsArray!=null){
 for(var i=0;i<this.valueNotifyTopicsArray.length;i++){
-var _e50=this.valueNotifyTopicsArray[i];
-if(!dojo.string.isBlank(_e50)){
+var _e5d=this.valueNotifyTopicsArray[i];
+if(!dojo.string.isBlank(_e5d)){
 try{
-dojo.event.topic.publish(_e50,this.inputNode.value);
+dojo.event.topic.publish(_e5d,this.inputNode.value);
 }
 catch(ex){
 dojo.debug(ex);
@@ -17241,14 +17287,14 @@ dojo.widget.defineWidget("struts.widget.BindEvent",struts.widget.Bind,{widgetTyp
 struts.widget.BindEvent.superclass.postCreate.apply(this);
 var self=this;
 if(!dojo.string.isBlank(this.events)&&!dojo.string.isBlank(this.sources)){
-var _e52=this.events.split(",");
-var _e53=this.sources.split(",");
-if(_e52&&this.domNode){
-dojo.lang.forEach(_e52,function(_e54){
-dojo.lang.forEach(_e53,function(_e55){
-var _e56=dojo.byId(_e55);
-if(_e56){
-dojo.event.connect(_e56,_e54,function(evt){
+var _e5f=this.events.split(",");
+var _e60=this.sources.split(",");
+if(_e5f&&this.domNode){
+dojo.lang.forEach(_e5f,function(_e61){
+dojo.lang.forEach(_e60,function(_e62){
+var _e63=dojo.byId(_e62);
+if(_e63){
+dojo.event.connect(_e63,_e61,function(evt){
 evt.preventDefault();
 evt.stopPropagation();
 self.reloadContents();
@@ -17293,26 +17339,26 @@ this.listenedTrees.splice(i,1);
 break;
 }
 }
-},onTreeDestroy:function(_e5b){
-this.unlistenTree(_e5b.source);
+},onTreeDestroy:function(_e68){
+this.unlistenTree(_e68.source);
 if(this.dieWithTree){
 this.destroy();
 }
-},onCollapse:function(_e5c){
+},onCollapse:function(_e69){
 if(!this.selectedNode){
 return;
 }
-var node=_e5c.source;
-var _e5e=this.selectedNode.parent;
-while(_e5e!==node&&_e5e.isTreeNode){
-_e5e=_e5e.parent;
+var node=_e69.source;
+var _e6b=this.selectedNode.parent;
+while(_e6b!==node&&_e6b.isTreeNode){
+_e6b=_e6b.parent;
 }
-if(_e5e.isTreeNode){
+if(_e6b.isTreeNode){
 this.deselect();
 }
-},select:function(_e5f){
-var node=_e5f.source;
-var e=_e5f.event;
+},select:function(_e6c){
+var node=_e6c.source;
+var e=_e6c.event;
 if(this.selectedNode===node){
 if(e.ctrlKey||e.shiftKey||e.metaKey){
 this.deselect();
@@ -17326,15 +17372,15 @@ this.deselect();
 }
 this.doSelect(node);
 dojo.event.topic.publish(this.eventNames.select,{node:node});
-},onMoveFrom:function(_e62){
-if(_e62.child!==this.selectedNode){
+},onMoveFrom:function(_e6f){
+if(_e6f.child!==this.selectedNode){
 return;
 }
-if(!dojo.lang.inArray(this.listenedTrees,_e62.newTree)){
+if(!dojo.lang.inArray(this.listenedTrees,_e6f.newTree)){
 this.deselect();
 }
-},onRemoveNode:function(_e63){
-if(_e63.child!==this.selectedNode){
+},onRemoveNode:function(_e70){
+if(_e70.child!==this.selectedNode){
 return;
 }
 this.deselect();
@@ -17367,13 +17413,13 @@ struts.widget.StrutsTreeSelector.superclass.listenTree.apply(this,[tree]);
 dojo.event.topic.unsubscribe(tree.eventNames.collapse,this,"collapse");
 dojo.event.topic.unsubscribe(tree.eventNames.expand,this,"expand");
 struts.widget.StrutsTreeSelector.superclass.unlistenTree.apply(this,[tree]);
-},publishTopics:function(_e68,node){
-if(_e68!=null){
-for(var i=0;i<_e68.length;i++){
-var _e6b=_e68[i];
-if(!dojo.string.isBlank(_e6b)){
+},publishTopics:function(_e75,node){
+if(_e75!=null){
+for(var i=0;i<_e75.length;i++){
+var _e78=_e75[i];
+if(!dojo.string.isBlank(_e78)){
 try{
-dojo.event.topic.publish(_e6b,node);
+dojo.event.topic.publish(_e78,node);
 }
 catch(ex){
 dojo.debug(ex);
@@ -17381,9 +17427,9 @@ dojo.debug(ex);
 }
 }
 }
-},select:function(_e6c){
-var node=_e6c.source;
-var e=_e6c.event;
+},select:function(_e79){
+var node=_e79.source;
+var e=_e79.event;
 if(this.selectedNode===node){
 if(e.ctrlKey||e.shiftKey||e.metaKey){
 this.deselect();
@@ -17397,22 +17443,22 @@ this.deselect();
 }
 this.doSelect(node);
 this.publishTopics(this.selectedNotifyTopicsArray,{node:node});
-},expand:function(_e6f){
-var node=_e6f.source;
+},expand:function(_e7c){
+var node=_e7c.source;
 this.publishTopics(this.expandedNotifyTopicsArray,{node:node});
-},collapse:function(_e71){
-var node=_e71.source;
+},collapse:function(_e7e){
+var node=_e7e.source;
 this.publishTopics(this.collapsedNotifyTopicsArray,{node:node});
 },});
 dojo.provide("dojo.widget.PageContainer");
 dojo.widget.defineWidget("dojo.widget.PageContainer",dojo.widget.HtmlWidget,{isContainer:true,doLayout:true,templateString:"<div dojoAttachPoint='containerNode'></div>",selectedChild:"",fillInTemplate:function(args,frag){
-var _e75=this.getFragNodeRef(frag);
-dojo.html.copyStyle(this.domNode,_e75);
+var _e82=this.getFragNodeRef(frag);
+dojo.html.copyStyle(this.domNode,_e82);
 dojo.widget.PageContainer.superclass.fillInTemplate.apply(this,arguments);
 },postCreate:function(args,frag){
 if(this.children.length){
 dojo.lang.forEach(this.children,this._setupChild,this);
-var _e78;
+var _e85;
 if(this.selectedChild){
 this.selectChild(this.selectedChild);
 }else{
@@ -17427,12 +17473,12 @@ this.selectChild(this.children[0]);
 }
 }
 }
-},addChild:function(_e7a){
+},addChild:function(_e87){
 dojo.widget.PageContainer.superclass.addChild.apply(this,arguments);
-this._setupChild(_e7a);
+this._setupChild(_e87);
 this.onResized();
 if(!this.selectedChildWidget){
-this.selectChild(_e7a);
+this.selectChild(_e87);
 }
 },_setupChild:function(page){
 page.hide();
@@ -17451,9 +17497,9 @@ if(this.children.length>0){
 this.selectChild(this.children[0],true);
 }
 }
-},selectChild:function(page,_e7e){
+},selectChild:function(page,_e8b){
 page=dojo.widget.byId(page);
-this.correspondingPageButton=_e7e;
+this.correspondingPageButton=_e8b;
 if(this.selectedChildWidget){
 this._hideChild(this.selectedChildWidget);
 }
@@ -17464,24 +17510,24 @@ page.isFirstChild=(page==this.children[0]);
 page.isLastChild=(page==this.children[this.children.length-1]);
 dojo.event.topic.publish(this.widgetId+"-selectChild",page);
 },forward:function(){
-var _e7f=dojo.lang.find(this.children,this.selectedChildWidget);
-this.selectChild(this.children[_e7f+1]);
+var _e8c=dojo.lang.find(this.children,this.selectedChildWidget);
+this.selectChild(this.children[_e8c+1]);
 },back:function(){
-var _e80=dojo.lang.find(this.children,this.selectedChildWidget);
-this.selectChild(this.children[_e80-1]);
+var _e8d=dojo.lang.find(this.children,this.selectedChildWidget);
+this.selectChild(this.children[_e8d-1]);
 },onResized:function(){
 if(this.doLayout&&this.selectedChildWidget){
 with(this.selectedChildWidget.domNode.style){
 top=dojo.html.getPixelValue(this.containerNode,"padding-top",true);
 left=dojo.html.getPixelValue(this.containerNode,"padding-left",true);
 }
-var _e81=dojo.html.getContentBox(this.containerNode);
-this.selectedChildWidget.resizeTo(_e81.width,_e81.height);
+var _e8e=dojo.html.getContentBox(this.containerNode);
+this.selectedChildWidget.resizeTo(_e8e.width,_e8e.height);
 }
 },_showChild:function(page){
 if(this.doLayout){
-var _e83=dojo.html.getContentBox(this.containerNode);
-page.resizeTo(_e83.width,_e83.height);
+var _e90=dojo.html.getContentBox(this.containerNode);
+page.resizeTo(_e90.width,_e90.height);
 }
 page.selected=true;
 page.show();
@@ -17489,8 +17535,8 @@ page.show();
 page.selected=false;
 page.hide();
 },closeChild:function(page){
-var _e86=page.onClose(this,page);
-if(_e86){
+var _e93=page.onClose(this,page);
+if(_e93){
 this.removeChild(page);
 page.destroy();
 }
@@ -17506,9 +17552,9 @@ dojo.html.addClass(this.domNode,this["class"]);
 dojo.widget.wai.setAttr(this.domNode,"waiRole","role","tablist");
 },postCreate:function(){
 this.pane2button={};
-var _e87=dojo.widget.byId(this.containerId);
-if(_e87){
-dojo.lang.forEach(_e87.children,this.onAddChild,this);
+var _e94=dojo.widget.byId(this.containerId);
+if(_e94){
+dojo.lang.forEach(_e94.children,this.onAddChild,this);
 }
 dojo.event.topic.subscribe(this.containerId+"-addChild",this,"onAddChild");
 dojo.event.topic.subscribe(this.containerId+"-removeChild",this,"onRemoveChild");
@@ -17519,50 +17565,50 @@ dojo.event.topic.unsubscribe(this.containerId+"-removeChild",this,"onRemoveChild
 dojo.event.topic.unsubscribe(this.containerId+"-selectChild",this,"onSelectChild");
 dojo.widget.PageController.superclass.destroy.apply(this,arguments);
 },onAddChild:function(page){
-var _e89=dojo.widget.createWidget(this.buttonWidget,{label:page.label,closeButton:page.closable});
-this.addChild(_e89);
-this.domNode.appendChild(_e89.domNode);
-this.pane2button[page]=_e89;
-page.controlButton=_e89;
-var _e8a=this;
-dojo.event.connect(_e89,"onClick",function(){
-_e8a.onButtonClick(page);
+var _e96=dojo.widget.createWidget(this.buttonWidget,{label:page.label,closeButton:page.closable});
+this.addChild(_e96);
+this.domNode.appendChild(_e96.domNode);
+this.pane2button[page]=_e96;
+page.controlButton=_e96;
+var _e97=this;
+dojo.event.connect(_e96,"onClick",function(){
+_e97.onButtonClick(page);
 });
-dojo.event.connect(_e89,"onCloseButtonClick",function(){
-_e8a.onCloseButtonClick(page);
+dojo.event.connect(_e96,"onCloseButtonClick",function(){
+_e97.onCloseButtonClick(page);
 });
 },onRemoveChild:function(page){
 if(this._currentChild==page){
 this._currentChild=null;
 }
-var _e8c=this.pane2button[page];
-if(_e8c){
-_e8c.destroy();
+var _e99=this.pane2button[page];
+if(_e99){
+_e99.destroy();
 }
 this.pane2button[page]=null;
 },onSelectChild:function(page){
 if(this._currentChild){
-var _e8e=this.pane2button[this._currentChild];
-_e8e.clearSelected();
+var _e9b=this.pane2button[this._currentChild];
+_e9b.clearSelected();
 }
-var _e8f=this.pane2button[page];
-_e8f.setSelected();
+var _e9c=this.pane2button[page];
+_e9c.setSelected();
 this._currentChild=page;
 },onButtonClick:function(page){
-var _e91=dojo.widget.byId(this.containerId);
-_e91.selectChild(page,false,this);
+var _e9e=dojo.widget.byId(this.containerId);
+_e9e.selectChild(page,false,this);
 },onCloseButtonClick:function(page){
-var _e93=dojo.widget.byId(this.containerId);
-_e93.closeChild(page);
+var _ea0=dojo.widget.byId(this.containerId);
+_ea0.closeChild(page);
 },onKey:function(evt){
 if((evt.keyCode==evt.KEY_RIGHT_ARROW)||(evt.keyCode==evt.KEY_LEFT_ARROW)){
-var _e95=0;
+var _ea2=0;
 var next=null;
-var _e95=dojo.lang.find(this.children,this.pane2button[this._currentChild]);
+var _ea2=dojo.lang.find(this.children,this.pane2button[this._currentChild]);
 if(evt.keyCode==evt.KEY_RIGHT_ARROW){
-next=this.children[(_e95+1)%this.children.length];
+next=this.children[(_ea2+1)%this.children.length];
 }else{
-next=this.children[(_e95+(this.children.length-1))%this.children.length];
+next=this.children[(_ea2+(this.children.length-1))%this.children.length];
 }
 dojo.event.browser.stopEvent(evt);
 next.onClick();
@@ -17615,20 +17661,20 @@ dojo.widget.TabContainer.superclass._setupChild.apply(this,arguments);
 if(!this.doLayout){
 return;
 }
-var _e9b=this.labelPosition.replace(/-h/,"");
-var _e9c=[{domNode:this.tablist.domNode,layoutAlign:_e9b},{domNode:this.containerNode,layoutAlign:"client"}];
-dojo.widget.html.layout(this.domNode,_e9c);
+var _ea8=this.labelPosition.replace(/-h/,"");
+var _ea9=[{domNode:this.tablist.domNode,layoutAlign:_ea8},{domNode:this.containerNode,layoutAlign:"client"}];
+dojo.widget.html.layout(this.domNode,_ea9);
 if(this.selectedChildWidget){
-var _e9d=dojo.html.getContentBox(this.containerNode);
-this.selectedChildWidget.resizeTo(_e9d.width,_e9d.height);
+var _eaa=dojo.html.getContentBox(this.containerNode);
+this.selectedChildWidget.resizeTo(_eaa.width,_eaa.height);
 }
-},selectTab:function(tab,_e9f){
+},selectTab:function(tab,_eac){
 dojo.deprecated("use selectChild() rather than selectTab(), selectTab() will be removed in","0.5");
-this.selectChild(tab,_e9f);
+this.selectChild(tab,_eac);
 },onKey:function(e){
 if(e.keyCode==e.KEY_UP_ARROW&&e.ctrlKey){
-var _ea1=this.correspondingTabButton||this.selectedTabWidget.tabButton;
-_ea1.focus();
+var _eae=this.correspondingTabButton||this.selectedTabWidget.tabButton;
+_eae.focus();
 dojo.event.browser.stopEvent(e);
 }else{
 if(e.keyCode==e.KEY_DELETE&&e.altKey){
@@ -17675,27 +17721,27 @@ this.disableTab(div);
 }
 });
 }
-},selectChild:function(tab,_ea5){
+},selectChild:function(tab,_eb2){
 if(!tab.disabled){
-var _ea6={"cancel":false};
+var _eb3={"cancel":false};
 if(this.beforeSelectTabNotifyTopicsArray){
 var self=this;
-dojo.lang.forEach(this.beforeSelectTabNotifyTopicsArray,function(_ea8){
+dojo.lang.forEach(this.beforeSelectTabNotifyTopicsArray,function(_eb5){
 try{
-dojo.event.topic.publish(_ea8,self,tab,_ea6);
+dojo.event.topic.publish(_eb5,self,tab,_eb3);
 }
 catch(ex){
 dojo.debug(ex);
 }
 });
 }
-if(!_ea6.cancel){
-struts.widget.StrutsTabContainer.superclass.selectChild.apply(this,[tab,_ea5]);
+if(!_eb3.cancel){
+struts.widget.StrutsTabContainer.superclass.selectChild.apply(this,[tab,_eb2]);
 if(this.afterSelectTabNotifyTopicsArray){
 var self=this;
-dojo.lang.forEach(this.afterSelectTabNotifyTopicsArray,function(_ea9){
+dojo.lang.forEach(this.afterSelectTabNotifyTopicsArray,function(_eb6){
 try{
-dojo.event.topic.publish(_ea9,self,tab,_ea6);
+dojo.event.topic.publish(_eb6,self,tab,_eb3);
 }
 catch(ex){
 dojo.debug(ex);
@@ -17705,13 +17751,13 @@ dojo.debug(ex);
 }
 }
 },disableTab:function(t){
-var _eab=this.getTabWidget(t);
-_eab.disabled=true;
-dojo.html.addClass(_eab.controlButton.domNode,this.disabledTabCssClass);
+var _eb8=this.getTabWidget(t);
+_eb8.disabled=true;
+dojo.html.addClass(_eb8.controlButton.domNode,this.disabledTabCssClass);
 },enableTab:function(t){
-var _ead=this.getTabWidget(t);
-_ead.disabled=false;
-dojo.html.removeClass(_ead.controlButton.domNode,this.disabledTabCssClass);
+var _eba=this.getTabWidget(t);
+_eba.disabled=false;
+dojo.html.removeClass(_eba.controlButton.domNode,this.disabledTabCssClass);
 },getTabWidget:function(t){
 if(dojo.lang.isNumber(t)){
 return this.children[t];
@@ -17738,19 +17784,19 @@ return this.tree.unlock.apply(this,arguments);
 return this.tree.isLocked.apply(this,arguments);
 },cleanLock:function(){
 return this.tree.cleanLock.apply(this,arguments);
-},actionIsDisabled:function(_eaf){
-var _eb0=this;
-var _eb1=false;
-if(this.tree.strictFolders&&_eaf==this.actions.ADDCHILD&&!this.isFolder){
-_eb1=true;
+},actionIsDisabled:function(_ebc){
+var _ebd=this;
+var _ebe=false;
+if(this.tree.strictFolders&&_ebc==this.actions.ADDCHILD&&!this.isFolder){
+_ebe=true;
 }
-if(dojo.lang.inArray(_eb0.actionsDisabled,_eaf)){
-_eb1=true;
+if(dojo.lang.inArray(_ebd.actionsDisabled,_ebc)){
+_ebe=true;
 }
 if(this.isLocked()){
-_eb1=true;
+_ebe=true;
 }
-return _eb1;
+return _ebe;
 },getInfo:function(){
 var info={widgetId:this.widgetId,objectId:this.objectId,index:this.getParentIndex(),isFolder:this.isFolder};
 return info;
@@ -17760,20 +17806,20 @@ for(var i=0;i<this.actionsDisabled.length;i++){
 this.actionsDisabled[i]=this.actionsDisabled[i].toUpperCase();
 }
 this.expandLevel=parseInt(this.expandLevel);
-},adjustDepth:function(_eb6){
+},adjustDepth:function(_ec3){
 for(var i=0;i<this.children.length;i++){
-this.children[i].adjustDepth(_eb6);
+this.children[i].adjustDepth(_ec3);
 }
-this.depth+=_eb6;
-if(_eb6>0){
-for(var i=0;i<_eb6;i++){
+this.depth+=_ec3;
+if(_ec3>0){
+for(var i=0;i<_ec3;i++){
 var img=this.tree.makeBlankImg();
 this.imgs.unshift(img);
 dojo.html.insertBefore(this.imgs[0],this.domNode.firstChild);
 }
 }
-if(_eb6<0){
-for(var i=0;i<-_eb6;i++){
+if(_ec3<0){
+for(var i=0;i<-_ec3;i++){
 this.imgs.shift();
 dojo.html.removeNode(this.domNode.firstChild);
 }
@@ -17795,9 +17841,9 @@ this._markLoadingSavedIcon=null;
 dojo.event.connect(this.expandIcon,"onclick",this,"onTreeClick");
 this.expandIcon.src=this.isExpanded?this.tree.expandIconSrcMinus:this.tree.expandIconSrcPlus;
 this.isFolder=true;
-},createDOMNode:function(tree,_ebb){
+},createDOMNode:function(tree,_ec8){
 this.tree=tree;
-this.depth=_ebb;
+this.depth=_ec8;
 this.imgs=[];
 for(var i=0;i<this.depth+1;i++){
 var img=this.tree.makeBlankImg();
@@ -17867,21 +17913,21 @@ this.setGridImage(-1,this.tree.blankIconSrc);
 }
 }
 },updateParentGrid:function(){
-var _ec2=this.parent;
+var _ecf=this.parent;
 for(var i=0;i<this.depth;i++){
 var idx=this.imgs.length-(3+i);
-var img=(this.tree.showGrid&&!_ec2.isLastChild())?this.tree.gridIconSrcV:this.tree.blankIconSrc;
+var img=(this.tree.showGrid&&!_ecf.isLastChild())?this.tree.gridIconSrcV:this.tree.blankIconSrc;
 this.setGridImage(idx,img);
-_ec2=_ec2.parent;
+_ecf=_ecf.parent;
 }
 },updateExpandGridColumn:function(){
 if(!this.tree.showGrid){
 return;
 }
-var _ec6=this;
+var _ed3=this;
 var icon=this.isLastChild()?this.tree.blankIconSrc:this.tree.gridIconSrcV;
-dojo.lang.forEach(_ec6.getDescendants(),function(node){
-node.setGridImage(_ec6.depth,icon);
+dojo.lang.forEach(_ed3.getDescendants(),function(node){
+node.setGridImage(_ed3.depth,icon);
 });
 this.updateExpandGrid();
 },updateIcons:function(){
@@ -17935,15 +17981,15 @@ dojo.dnd.dragManager.cacheTargetLocations();
 return this.tree.addChild.apply(this,arguments);
 },doAddChild:function(){
 return this.tree.doAddChild.apply(this,arguments);
-},edit:function(_ecb){
-dojo.lang.mixin(this,_ecb);
-if(_ecb.title){
+},edit:function(_ed8){
+dojo.lang.mixin(this,_ed8);
+if(_ed8.title){
 this.titleNode.innerHTML=this.title;
 }
-if(_ecb.afterLabel){
+if(_ed8.afterLabel){
 this.afterLabelNode.innerHTML=this.afterLabel;
 }
-if(_ecb.childIconSrc){
+if(_ed8.childIconSrc){
 this.buildChildIcon();
 }
 },removeNode:function(){
@@ -17961,8 +18007,8 @@ this.reload();
 struts.widget.StrutsTreeNode.superclass.expand.apply(this);
 },removeChildren:function(){
 var self=this;
-var _ecd=dojo.lang.toArray(this.children);
-dojo.lang.forEach(_ecd,function(node){
+var _eda=dojo.lang.toArray(this.children);
+dojo.lang.forEach(_eda,function(node){
 self.removeNode(node);
 });
 },reload:function(){
@@ -17970,15 +18016,15 @@ var href=this.tree.href;
 this.loaded=true;
 if(!dojo.string.isBlank(href)){
 this.removeChildren();
-var _ed0=href+(href.indexOf("?")>-1?"&":"?")+"nodeId="+this.widgetId;
+var _edd=href+(href.indexOf("?")>-1?"&":"?")+"nodeId="+this.widgetId;
 var self=this;
 this.markLoading();
-dojo.io.bind({url:_ed0,useCache:false,preventCache:true,handler:function(type,data,e){
+dojo.io.bind({url:_edd,useCache:false,preventCache:true,handler:function(type,data,e){
 if(type=="load"){
 if(data){
-dojo.lang.forEach(data,function(_ed5){
-var _ed6=dojo.widget.createWidget("struts:StrutsTreeNode",{title:_ed5.label,isFolder:_ed5.hasChildren,widgetId:_ed5.id});
-self.addChild(_ed6);
+dojo.lang.forEach(data,function(_ee2){
+var _ee3=dojo.widget.createWidget("struts:StrutsTreeNode",{title:_ee2.label,isFolder:_ee2.hasChildren,widgetId:_ee2.id});
+self.addChild(_ee3);
 });
 }
 }
@@ -17987,8 +18033,8 @@ self.unMarkLoading();
 }
 }});
 dojo.provide("dojo.json");
-dojo.json={jsonRegistry:new dojo.AdapterRegistry(),register:function(name,_ed8,wrap,_eda){
-dojo.json.jsonRegistry.register(name,_ed8,wrap,_eda);
+dojo.json={jsonRegistry:new dojo.AdapterRegistry(),register:function(name,_ee5,wrap,_ee7){
+dojo.json.jsonRegistry.register(name,_ee5,wrap,_ee7);
 },evalJson:function(json){
 try{
 return eval("("+json+")");
@@ -17998,11 +18044,11 @@ dojo.debug(e);
 return json;
 }
 },serialize:function(o){
-var _edd=typeof (o);
-if(_edd=="undefined"){
+var _eea=typeof (o);
+if(_eea=="undefined"){
 return "undefined";
 }else{
-if((_edd=="number")||(_edd=="boolean")){
+if((_eea=="number")||(_eea=="boolean")){
 return o+"";
 }else{
 if(o===null){
@@ -18010,24 +18056,24 @@ return "null";
 }
 }
 }
-if(_edd=="string"){
+if(_eea=="string"){
 return dojo.string.escapeString(o);
 }
 var me=arguments.callee;
-var _edf;
+var _eec;
 if(typeof (o.__json__)=="function"){
-_edf=o.__json__();
-if(o!==_edf){
-return me(_edf);
+_eec=o.__json__();
+if(o!==_eec){
+return me(_eec);
 }
 }
 if(typeof (o.json)=="function"){
-_edf=o.json();
-if(o!==_edf){
-return me(_edf);
+_eec=o.json();
+if(o!==_eec){
+return me(_eec);
 }
 }
-if(_edd!="function"&&typeof (o.length)=="number"){
+if(_eea!="function"&&typeof (o.length)=="number"){
 var res=[];
 for(var i=0;i<o.length;i++){
 var val=me(o[i]);
@@ -18040,22 +18086,22 @@ return "["+res.join(",")+"]";
 }
 try{
 window.o=o;
-_edf=dojo.json.jsonRegistry.match(o);
-return me(_edf);
+_eec=dojo.json.jsonRegistry.match(o);
+return me(_eec);
 }
 catch(e){
 }
-if(_edd=="function"){
+if(_eea=="function"){
 return null;
 }
 res=[];
 for(var k in o){
-var _ee4;
+var _ef1;
 if(typeof (k)=="number"){
-_ee4="\""+k+"\"";
+_ef1="\""+k+"\"";
 }else{
 if(typeof (k)=="string"){
-_ee4=dojo.string.escapeString(k);
+_ef1=dojo.string.escapeString(k);
 }else{
 continue;
 }
@@ -18064,62 +18110,62 @@ val=me(o[k]);
 if(typeof (val)!="string"){
 continue;
 }
-res.push(_ee4+":"+val);
+res.push(_ef1+":"+val);
 }
 return "{"+res.join(",")+"}";
 }};
 dojo.provide("dojo.dnd.TreeDragAndDrop");
-dojo.dnd.TreeDragSource=function(node,_ee6,type,_ee8){
-this.controller=_ee6;
-this.treeNode=_ee8;
+dojo.dnd.TreeDragSource=function(node,_ef3,type,_ef5){
+this.controller=_ef3;
+this.treeNode=_ef5;
 dojo.dnd.HtmlDragSource.call(this,node,type);
 };
 dojo.inherits(dojo.dnd.TreeDragSource,dojo.dnd.HtmlDragSource);
 dojo.lang.extend(dojo.dnd.TreeDragSource,{onDragStart:function(){
-var _ee9=dojo.dnd.HtmlDragSource.prototype.onDragStart.call(this);
-_ee9.treeNode=this.treeNode;
-_ee9.onDragStart=dojo.lang.hitch(_ee9,function(e){
+var _ef6=dojo.dnd.HtmlDragSource.prototype.onDragStart.call(this);
+_ef6.treeNode=this.treeNode;
+_ef6.onDragStart=dojo.lang.hitch(_ef6,function(e){
 this.savedSelectedNode=this.treeNode.tree.selector.selectedNode;
 if(this.savedSelectedNode){
 this.savedSelectedNode.unMarkSelected();
 }
-var _eeb=dojo.dnd.HtmlDragObject.prototype.onDragStart.apply(this,arguments);
-var _eec=this.dragClone.getElementsByTagName("img");
-for(var i=0;i<_eec.length;i++){
-_eec.item(i).style.backgroundImage="url()";
+var _ef8=dojo.dnd.HtmlDragObject.prototype.onDragStart.apply(this,arguments);
+var _ef9=this.dragClone.getElementsByTagName("img");
+for(var i=0;i<_ef9.length;i++){
+_ef9.item(i).style.backgroundImage="url()";
 }
-return _eeb;
+return _ef8;
 });
-_ee9.onDragEnd=function(e){
+_ef6.onDragEnd=function(e){
 if(this.savedSelectedNode){
 this.savedSelectedNode.markSelected();
 }
 return dojo.dnd.HtmlDragObject.prototype.onDragEnd.apply(this,arguments);
 };
-return _ee9;
+return _ef6;
 },onDragEnd:function(e){
 var res=dojo.dnd.HtmlDragSource.prototype.onDragEnd.call(this,e);
 return res;
 }});
-dojo.dnd.TreeDropTarget=function(_ef1,_ef2,type,_ef4){
-this.treeNode=_ef4;
-this.controller=_ef2;
-dojo.dnd.HtmlDropTarget.apply(this,[_ef1,type]);
+dojo.dnd.TreeDropTarget=function(_efe,_eff,type,_f01){
+this.treeNode=_f01;
+this.controller=_eff;
+dojo.dnd.HtmlDropTarget.apply(this,[_efe,type]);
 };
 dojo.inherits(dojo.dnd.TreeDropTarget,dojo.dnd.HtmlDropTarget);
-dojo.lang.extend(dojo.dnd.TreeDropTarget,{autoExpandDelay:1500,autoExpandTimer:null,position:null,indicatorStyle:"2px black solid",showIndicator:function(_ef5){
-if(this.position==_ef5){
+dojo.lang.extend(dojo.dnd.TreeDropTarget,{autoExpandDelay:1500,autoExpandTimer:null,position:null,indicatorStyle:"2px black solid",showIndicator:function(_f02){
+if(this.position==_f02){
 return;
 }
 this.hideIndicator();
-this.position=_ef5;
-if(_ef5=="before"){
+this.position=_f02;
+if(_f02=="before"){
 this.treeNode.labelNode.style.borderTop=this.indicatorStyle;
 }else{
-if(_ef5=="after"){
+if(_f02=="after"){
 this.treeNode.labelNode.style.borderBottom=this.indicatorStyle;
 }else{
-if(_ef5=="onto"){
+if(_f02=="onto"){
 this.treeNode.markSelected();
 }
 }
@@ -18130,42 +18176,42 @@ this.treeNode.labelNode.style.borderTop="";
 this.treeNode.unMarkSelected();
 this.position=null;
 },onDragOver:function(e){
-var _ef7=dojo.dnd.HtmlDropTarget.prototype.onDragOver.apply(this,arguments);
-if(_ef7&&this.treeNode.isFolder&&!this.treeNode.isExpanded){
+var _f04=dojo.dnd.HtmlDropTarget.prototype.onDragOver.apply(this,arguments);
+if(_f04&&this.treeNode.isFolder&&!this.treeNode.isExpanded){
 this.setAutoExpandTimer();
 }
-return _ef7;
-},accepts:function(_ef8){
-var _ef9=dojo.dnd.HtmlDropTarget.prototype.accepts.apply(this,arguments);
-if(!_ef9){
+return _f04;
+},accepts:function(_f05){
+var _f06=dojo.dnd.HtmlDropTarget.prototype.accepts.apply(this,arguments);
+if(!_f06){
 return false;
 }
-var _efa=_ef8[0].treeNode;
-if(dojo.lang.isUndefined(_efa)||!_efa||!_efa.isTreeNode){
+var _f07=_f05[0].treeNode;
+if(dojo.lang.isUndefined(_f07)||!_f07||!_f07.isTreeNode){
 dojo.raise("Source is not TreeNode or not found");
 }
-if(_efa===this.treeNode){
+if(_f07===this.treeNode){
 return false;
 }
 return true;
 },setAutoExpandTimer:function(){
-var _efb=this;
-var _efc=function(){
-if(dojo.dnd.dragManager.currentDropTarget===_efb){
-_efb.controller.expand(_efb.treeNode);
+var _f08=this;
+var _f09=function(){
+if(dojo.dnd.dragManager.currentDropTarget===_f08){
+_f08.controller.expand(_f08.treeNode);
 }
 };
-this.autoExpandTimer=dojo.lang.setTimeout(_efc,_efb.autoExpandDelay);
+this.autoExpandTimer=dojo.lang.setTimeout(_f09,_f08.autoExpandDelay);
 },getDNDMode:function(){
 return this.treeNode.tree.DNDMode;
-},getAcceptPosition:function(e,_efe){
-var _eff=this.getDNDMode();
-if(_eff&dojo.widget.Tree.prototype.DNDModes.ONTO&&!(!this.treeNode.actionIsDisabled(dojo.widget.TreeNode.prototype.actions.ADDCHILD)&&_efe.parent!==this.treeNode&&this.controller.canMove(_efe,this.treeNode))){
-_eff&=~dojo.widget.Tree.prototype.DNDModes.ONTO;
+},getAcceptPosition:function(e,_f0b){
+var _f0c=this.getDNDMode();
+if(_f0c&dojo.widget.Tree.prototype.DNDModes.ONTO&&!(!this.treeNode.actionIsDisabled(dojo.widget.TreeNode.prototype.actions.ADDCHILD)&&_f0b.parent!==this.treeNode&&this.controller.canMove(_f0b,this.treeNode))){
+_f0c&=~dojo.widget.Tree.prototype.DNDModes.ONTO;
 }
-var _f00=this.getPosition(e,_eff);
-if(_f00=="onto"||(!this.isAdjacentNode(_efe,_f00)&&this.controller.canMove(_efe,this.treeNode.parent))){
-return _f00;
+var _f0d=this.getPosition(e,_f0c);
+if(_f0d=="onto"||(!this.isAdjacentNode(_f0b,_f0d)&&this.controller.canMove(_f0b,this.treeNode.parent))){
+return _f0d;
 }else{
 return false;
 }
@@ -18177,77 +18223,77 @@ if(this.autoExpandTimer){
 clearTimeout(this.autoExpandTimer);
 this.autoExpandTimer=null;
 }
-},onDragMove:function(e,_f03){
-var _f04=_f03[0].treeNode;
-var _f05=this.getAcceptPosition(e,_f04);
-if(_f05){
-this.showIndicator(_f05);
+},onDragMove:function(e,_f10){
+var _f11=_f10[0].treeNode;
+var _f12=this.getAcceptPosition(e,_f11);
+if(_f12){
+this.showIndicator(_f12);
 }
-},isAdjacentNode:function(_f06,_f07){
-if(_f06===this.treeNode){
+},isAdjacentNode:function(_f13,_f14){
+if(_f13===this.treeNode){
 return true;
 }
-if(_f06.getNextSibling()===this.treeNode&&_f07=="before"){
+if(_f13.getNextSibling()===this.treeNode&&_f14=="before"){
 return true;
 }
-if(_f06.getPreviousSibling()===this.treeNode&&_f07=="after"){
+if(_f13.getPreviousSibling()===this.treeNode&&_f14=="after"){
 return true;
 }
 return false;
-},getPosition:function(e,_f09){
+},getPosition:function(e,_f16){
 var node=dojo.byId(this.treeNode.labelNode);
-var _f0b=e.pageY||e.clientY+dojo.body().scrollTop;
-var _f0c=dojo.html.getAbsolutePosition(node).y;
-var _f0d=dojo.html.getBorderBox(node).height;
-var relY=_f0b-_f0c;
-var p=relY/_f0d;
-var _f10="";
-if(_f09&dojo.widget.Tree.prototype.DNDModes.ONTO&&_f09&dojo.widget.Tree.prototype.DNDModes.BETWEEN){
+var _f18=e.pageY||e.clientY+dojo.body().scrollTop;
+var _f19=dojo.html.getAbsolutePosition(node).y;
+var _f1a=dojo.html.getBorderBox(node).height;
+var relY=_f18-_f19;
+var p=relY/_f1a;
+var _f1d="";
+if(_f16&dojo.widget.Tree.prototype.DNDModes.ONTO&&_f16&dojo.widget.Tree.prototype.DNDModes.BETWEEN){
 if(p<=0.3){
-_f10="before";
+_f1d="before";
 }else{
 if(p<=0.7){
-_f10="onto";
+_f1d="onto";
 }else{
-_f10="after";
+_f1d="after";
 }
 }
 }else{
-if(_f09&dojo.widget.Tree.prototype.DNDModes.BETWEEN){
+if(_f16&dojo.widget.Tree.prototype.DNDModes.BETWEEN){
 if(p<=0.5){
-_f10="before";
+_f1d="before";
 }else{
-_f10="after";
+_f1d="after";
 }
 }else{
-if(_f09&dojo.widget.Tree.prototype.DNDModes.ONTO){
-_f10="onto";
+if(_f16&dojo.widget.Tree.prototype.DNDModes.ONTO){
+_f1d="onto";
 }
 }
 }
-return _f10;
-},getTargetParentIndex:function(_f11,_f12){
-var _f13=_f12=="before"?this.treeNode.getParentIndex():this.treeNode.getParentIndex()+1;
-if(this.treeNode.parent===_f11.parent&&this.treeNode.getParentIndex()>_f11.getParentIndex()){
-_f13--;
+return _f1d;
+},getTargetParentIndex:function(_f1e,_f1f){
+var _f20=_f1f=="before"?this.treeNode.getParentIndex():this.treeNode.getParentIndex()+1;
+if(this.treeNode.parent===_f1e.parent&&this.treeNode.getParentIndex()>_f1e.getParentIndex()){
+_f20--;
 }
-return _f13;
+return _f20;
 },onDrop:function(e){
-var _f15=this.position;
+var _f22=this.position;
 this.onDragOut(e);
-var _f16=e.dragObject.treeNode;
-if(!dojo.lang.isObject(_f16)){
+var _f23=e.dragObject.treeNode;
+if(!dojo.lang.isObject(_f23)){
 dojo.raise("TreeNode not found in dragObject");
 }
-if(_f15=="onto"){
-return this.controller.move(_f16,this.treeNode,0);
+if(_f22=="onto"){
+return this.controller.move(_f23,this.treeNode,0);
 }else{
-var _f17=this.getTargetParentIndex(_f16,_f15);
-return this.controller.move(_f16,this.treeNode.parent,_f17);
+var _f24=this.getTargetParentIndex(_f23,_f22);
+return this.controller.move(_f23,this.treeNode.parent,_f24);
 }
 }});
-dojo.dnd.TreeDNDController=function(_f18){
-this.treeController=_f18;
+dojo.dnd.TreeDNDController=function(_f25){
+this.treeController=_f25;
 this.dragSources={};
 this.dropTargets={};
 };
@@ -18265,34 +18311,34 @@ dojo.event.topic.unsubscribe(tree.eventNames.moveTo,this,"onMoveTo");
 dojo.event.topic.unsubscribe(tree.eventNames.addChild,this,"onAddChild");
 dojo.event.topic.unsubscribe(tree.eventNames.removeNode,this,"onRemoveNode");
 dojo.event.topic.unsubscribe(tree.eventNames.treeDestroy,this,"onTreeDestroy");
-},onTreeDestroy:function(_f1b){
-this.unlistenTree(_f1b.source);
-},onCreateDOMNode:function(_f1c){
-this.registerDNDNode(_f1c.source);
-},onAddChild:function(_f1d){
-this.registerDNDNode(_f1d.child);
-},onMoveFrom:function(_f1e){
-var _f1f=this;
-dojo.lang.forEach(_f1e.child.getDescendants(),function(node){
-_f1f.unregisterDNDNode(node);
+},onTreeDestroy:function(_f28){
+this.unlistenTree(_f28.source);
+},onCreateDOMNode:function(_f29){
+this.registerDNDNode(_f29.source);
+},onAddChild:function(_f2a){
+this.registerDNDNode(_f2a.child);
+},onMoveFrom:function(_f2b){
+var _f2c=this;
+dojo.lang.forEach(_f2b.child.getDescendants(),function(node){
+_f2c.unregisterDNDNode(node);
 });
-},onMoveTo:function(_f21){
-var _f22=this;
-dojo.lang.forEach(_f21.child.getDescendants(),function(node){
-_f22.registerDNDNode(node);
+},onMoveTo:function(_f2e){
+var _f2f=this;
+dojo.lang.forEach(_f2e.child.getDescendants(),function(node){
+_f2f.registerDNDNode(node);
 });
 },registerDNDNode:function(node){
 if(!node.tree.DNDMode){
 return;
 }
-var _f25=null;
-var _f26=null;
+var _f32=null;
+var _f33=null;
 if(!node.actionIsDisabled(node.actions.MOVE)){
-var _f25=new dojo.dnd.TreeDragSource(node.labelNode,this,node.tree.widgetId,node);
-this.dragSources[node.widgetId]=_f25;
+var _f32=new dojo.dnd.TreeDragSource(node.labelNode,this,node.tree.widgetId,node);
+this.dragSources[node.widgetId]=_f32;
 }
-var _f26=new dojo.dnd.TreeDropTarget(node.labelNode,this.treeController,node.tree.DNDAcceptTypes,node);
-this.dropTargets[node.widgetId]=_f26;
+var _f33=new dojo.dnd.TreeDropTarget(node.labelNode,this.treeController,node.tree.DNDAcceptTypes,node);
+this.dropTargets[node.widgetId]=_f33;
 },unregisterDNDNode:function(node){
 if(this.dragSources[node.widgetId]){
 dojo.dnd.dragManager.unregisterDragSource(this.dragSources[node.widgetId]);
@@ -18321,45 +18367,45 @@ dojo.event.topic.unsubscribe(tree.eventNames.createDOMNode,this,"onCreateDOMNode
 dojo.event.topic.unsubscribe(tree.eventNames.treeClick,this,"onTreeClick");
 dojo.event.topic.unsubscribe(tree.eventNames.treeCreate,this,"onTreeCreate");
 dojo.event.topic.unsubscribe(tree.eventNames.treeDestroy,this,"onTreeDestroy");
-},onTreeDestroy:function(_f2c){
-var tree=_f2c.source;
+},onTreeDestroy:function(_f39){
+var tree=_f39.source;
 this.unlistenTree(tree);
 if(this.dieWithTree){
 this.destroy();
 }
-},onCreateDOMNode:function(_f2e){
-var node=_f2e.source;
+},onCreateDOMNode:function(_f3b){
+var node=_f3b.source;
 if(node.expandLevel>0){
 this.expandToLevel(node,node.expandLevel);
 }
-},onTreeCreate:function(_f30){
-var tree=_f30.source;
-var _f32=this;
+},onTreeCreate:function(_f3d){
+var tree=_f3d.source;
+var _f3f=this;
 if(tree.expandLevel){
-dojo.lang.forEach(tree.children,function(_f33){
-_f32.expandToLevel(_f33,tree.expandLevel-1);
+dojo.lang.forEach(tree.children,function(_f40){
+_f3f.expandToLevel(_f40,tree.expandLevel-1);
 });
 }
-},expandToLevel:function(node,_f35){
-if(_f35==0){
+},expandToLevel:function(node,_f42){
+if(_f42==0){
 return;
 }
-var _f36=node.children;
-var _f37=this;
-var _f38=function(node,_f3a){
+var _f43=node.children;
+var _f44=this;
+var _f45=function(node,_f47){
 this.node=node;
-this.expandLevel=_f3a;
+this.expandLevel=_f47;
 this.process=function(){
 for(var i=0;i<this.node.children.length;i++){
-var _f3c=node.children[i];
-_f37.expandToLevel(_f3c,this.expandLevel);
+var _f49=node.children[i];
+_f44.expandToLevel(_f49,this.expandLevel);
 }
 };
 };
-var h=new _f38(node,_f35-1);
+var h=new _f45(node,_f42-1);
 this.expand(node,false,h,h.process);
-},onTreeClick:function(_f3e){
-var node=_f3e.source;
+},onTreeClick:function(_f4b){
+var node=_f4b.source;
 if(node.isLocked()){
 return false;
 }
@@ -18368,77 +18414,77 @@ this.collapse(node);
 }else{
 this.expand(node);
 }
-},expand:function(node,sync,_f42,_f43){
+},expand:function(node,sync,_f4f,_f50){
 node.expand();
-if(_f43){
-_f43.apply(_f42,[node]);
+if(_f50){
+_f50.apply(_f4f,[node]);
 }
 },collapse:function(node){
 node.collapse();
-},canMove:function(_f45,_f46){
-if(_f45.actionIsDisabled(_f45.actions.MOVE)){
+},canMove:function(_f52,_f53){
+if(_f52.actionIsDisabled(_f52.actions.MOVE)){
 return false;
 }
-if(_f45.parent!==_f46&&_f46.actionIsDisabled(_f46.actions.ADDCHILD)){
+if(_f52.parent!==_f53&&_f53.actionIsDisabled(_f53.actions.ADDCHILD)){
 return false;
 }
-var node=_f46;
+var node=_f53;
 while(node.isTreeNode){
-if(node===_f45){
+if(node===_f52){
 return false;
 }
 node=node.parent;
 }
 return true;
-},move:function(_f48,_f49,_f4a){
-if(!this.canMove(_f48,_f49)){
+},move:function(_f55,_f56,_f57){
+if(!this.canMove(_f55,_f56)){
 return false;
 }
-var _f4b=this.doMove(_f48,_f49,_f4a);
-if(!_f4b){
-return _f4b;
+var _f58=this.doMove(_f55,_f56,_f57);
+if(!_f58){
+return _f58;
 }
-if(_f49.isTreeNode){
-this.expand(_f49);
+if(_f56.isTreeNode){
+this.expand(_f56);
 }
-return _f4b;
-},doMove:function(_f4c,_f4d,_f4e){
-_f4c.tree.move(_f4c,_f4d,_f4e);
+return _f58;
+},doMove:function(_f59,_f5a,_f5b){
+_f59.tree.move(_f59,_f5a,_f5b);
 return true;
-},canRemoveNode:function(_f4f){
-if(_f4f.actionIsDisabled(_f4f.actions.REMOVE)){
+},canRemoveNode:function(_f5c){
+if(_f5c.actionIsDisabled(_f5c.actions.REMOVE)){
 return false;
 }
 return true;
-},removeNode:function(node,_f51,_f52){
+},removeNode:function(node,_f5e,_f5f){
 if(!this.canRemoveNode(node)){
 return false;
 }
-return this.doRemoveNode(node,_f51,_f52);
-},doRemoveNode:function(node,_f54,_f55){
+return this.doRemoveNode(node,_f5e,_f5f);
+},doRemoveNode:function(node,_f61,_f62){
 node.tree.removeNode(node);
-if(_f55){
-_f55.apply(dojo.lang.isUndefined(_f54)?this:_f54,[node]);
+if(_f62){
+_f62.apply(dojo.lang.isUndefined(_f61)?this:_f61,[node]);
 }
-},canCreateChild:function(_f56,_f57,data){
-if(_f56.actionIsDisabled(_f56.actions.ADDCHILD)){
+},canCreateChild:function(_f63,_f64,data){
+if(_f63.actionIsDisabled(_f63.actions.ADDCHILD)){
 return false;
 }
 return true;
-},createChild:function(_f59,_f5a,data,_f5c,_f5d){
-if(!this.canCreateChild(_f59,_f5a,data)){
+},createChild:function(_f66,_f67,data,_f69,_f6a){
+if(!this.canCreateChild(_f66,_f67,data)){
 return false;
 }
 return this.doCreateChild.apply(this,arguments);
-},doCreateChild:function(_f5e,_f5f,data,_f61,_f62){
-var _f63=data.widgetType?data.widgetType:"TreeNode";
-var _f64=dojo.widget.createWidget(_f63,data);
-_f5e.addChild(_f64,_f5f);
-this.expand(_f5e);
-if(_f62){
-_f62.apply(_f61,[_f64]);
+},doCreateChild:function(_f6b,_f6c,data,_f6e,_f6f){
+var _f70=data.widgetType?data.widgetType:"TreeNode";
+var _f71=dojo.widget.createWidget(_f70,data);
+_f6b.addChild(_f71,_f6c);
+this.expand(_f6b);
+if(_f6f){
+_f6f.apply(_f6e,[_f71]);
 }
-return _f64;
+return _f71;
 }});
 dojo.provide("dojo.widget.Tree");
 dojo.widget.defineWidget("dojo.widget.Tree",dojo.widget.HtmlWidget,function(){
@@ -18446,9 +18492,9 @@ this.eventNames={};
 this.tree=this;
 this.DNDAcceptTypes=[];
 this.actionsDisabled=[];
-},{widgetType:"Tree",eventNamesDefault:{createDOMNode:"createDOMNode",treeCreate:"treeCreate",treeDestroy:"treeDestroy",treeClick:"treeClick",iconClick:"iconClick",titleClick:"titleClick",moveFrom:"moveFrom",moveTo:"moveTo",addChild:"addChild",removeNode:"removeNode",expand:"expand",collapse:"collapse"},isContainer:true,DNDMode:"off",lockLevel:0,strictFolders:true,DNDModes:{BETWEEN:1,ONTO:2},DNDAcceptTypes:"",templateCssString:"\n.dojoTree {\n\tfont: caption;\n\tfont-size: 11px;\n\tfont-weight: normal;\n\toverflow: auto;\n}\n\n\n.dojoTreeNodeLabelTitle {\n\tpadding-left: 2px;\n\tcolor: WindowText;\n}\n\n.dojoTreeNodeLabel {\n\tcursor:hand;\n\tcursor:pointer;\n}\n\n.dojoTreeNodeLabelTitle:hover {\n\ttext-decoration: underline;\n}\n\n.dojoTreeNodeLabelSelected {\n\tbackground-color: Highlight;\n\tcolor: HighlightText;\n}\n\n.dojoTree div {\n\twhite-space: nowrap;\n}\n\n.dojoTree img, .dojoTreeNodeLabel img {\n\tvertical-align: middle;\n}\n\n",templateCssPath:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/Tree.css"),templateString:"<div class=\"dojoTree\"></div>",isExpanded:true,isTree:true,objectId:"",controller:"",selector:"",menu:"",expandLevel:"",blankIconSrc:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_blank.gif"),gridIconSrcT:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_grid_t.gif"),gridIconSrcL:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_grid_l.gif"),gridIconSrcV:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_grid_v.gif"),gridIconSrcP:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_grid_p.gif"),gridIconSrcC:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_grid_c.gif"),gridIconSrcX:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_grid_x.gif"),gridIconSrcY:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_grid_y.gif"),gridIconSrcZ:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_grid_z.gif"),expandIconSrcPlus:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_expand_plus.gif"),expandIconSrcMinus:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_expand_minus.gif"),expandIconSrcLoading:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_loading.gif"),iconWidth:18,iconHeight:18,showGrid:true,showRootGrid:true,actionIsDisabled:function(_f65){
-var _f66=this;
-return dojo.lang.inArray(_f66.actionsDisabled,_f65);
+},{widgetType:"Tree",eventNamesDefault:{createDOMNode:"createDOMNode",treeCreate:"treeCreate",treeDestroy:"treeDestroy",treeClick:"treeClick",iconClick:"iconClick",titleClick:"titleClick",moveFrom:"moveFrom",moveTo:"moveTo",addChild:"addChild",removeNode:"removeNode",expand:"expand",collapse:"collapse"},isContainer:true,DNDMode:"off",lockLevel:0,strictFolders:true,DNDModes:{BETWEEN:1,ONTO:2},DNDAcceptTypes:"",templateCssString:"\n.dojoTree {\n\tfont: caption;\n\tfont-size: 11px;\n\tfont-weight: normal;\n\toverflow: auto;\n}\n\n\n.dojoTreeNodeLabelTitle {\n\tpadding-left: 2px;\n\tcolor: WindowText;\n}\n\n.dojoTreeNodeLabel {\n\tcursor:hand;\n\tcursor:pointer;\n}\n\n.dojoTreeNodeLabelTitle:hover {\n\ttext-decoration: underline;\n}\n\n.dojoTreeNodeLabelSelected {\n\tbackground-color: Highlight;\n\tcolor: HighlightText;\n}\n\n.dojoTree div {\n\twhite-space: nowrap;\n}\n\n.dojoTree img, .dojoTreeNodeLabel img {\n\tvertical-align: middle;\n}\n\n",templateCssPath:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/Tree.css"),templateString:"<div class=\"dojoTree\"></div>",isExpanded:true,isTree:true,objectId:"",controller:"",selector:"",menu:"",expandLevel:"",blankIconSrc:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_blank.gif"),gridIconSrcT:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_grid_t.gif"),gridIconSrcL:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_grid_l.gif"),gridIconSrcV:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_grid_v.gif"),gridIconSrcP:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_grid_p.gif"),gridIconSrcC:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_grid_c.gif"),gridIconSrcX:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_grid_x.gif"),gridIconSrcY:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_grid_y.gif"),gridIconSrcZ:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_grid_z.gif"),expandIconSrcPlus:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_expand_plus.gif"),expandIconSrcMinus:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_expand_minus.gif"),expandIconSrcLoading:dojo.uri.moduleUri("dojo.widget","templates/images/Tree/treenode_loading.gif"),iconWidth:18,iconHeight:18,showGrid:true,showRootGrid:true,actionIsDisabled:function(_f72){
+var _f73=this;
+return dojo.lang.inArray(_f73.actionsDisabled,_f72);
 },actions:{ADDCHILD:"ADDCHILD"},getInfo:function(){
 var info={widgetId:this.widgetId,objectId:this.objectId};
 return info;
@@ -18475,7 +18521,7 @@ this.selector.listenTree(this);
 this.selector=null;
 }
 },initialize:function(args,frag){
-var _f6a=this;
+var _f77=this;
 for(name in this.eventNamesDefault){
 if(dojo.lang.isUndefined(this.eventNames[name])){
 this.eventNames[name]=this.widgetId+"/"+this.eventNamesDefault[name];
@@ -18521,15 +18567,15 @@ dojo.event.topic.publish(this.eventNames.treeCreate,{source:this});
 },destroy:function(){
 dojo.event.topic.publish(this.tree.eventNames.treeDestroy,{source:this});
 return dojo.widget.HtmlWidget.prototype.destroy.apply(this,arguments);
-},addChild:function(_f6e,_f6f){
-var _f70={child:_f6e,index:_f6f,parent:this,domNodeInitialized:_f6e.domNodeInitialized};
+},addChild:function(_f7b,_f7c){
+var _f7d={child:_f7b,index:_f7c,parent:this,domNodeInitialized:_f7b.domNodeInitialized};
 this.doAddChild.apply(this,arguments);
-dojo.event.topic.publish(this.tree.eventNames.addChild,_f70);
-},doAddChild:function(_f71,_f72){
-if(dojo.lang.isUndefined(_f72)){
-_f72=this.children.length;
+dojo.event.topic.publish(this.tree.eventNames.addChild,_f7d);
+},doAddChild:function(_f7e,_f7f){
+if(dojo.lang.isUndefined(_f7f)){
+_f7f=this.children.length;
 }
-if(!_f71.isTreeNode){
+if(!_f7e.isTreeNode){
 dojo.raise("You can only add TreeNode widgets to a "+this.widgetType+" widget!");
 return;
 }
@@ -18538,34 +18584,34 @@ if(!this.isFolder){
 this.setFolder();
 }
 }
-var _f73=this;
-dojo.lang.forEach(_f71.getDescendants(),function(elem){
-elem.tree=_f73.tree;
+var _f80=this;
+dojo.lang.forEach(_f7e.getDescendants(),function(elem){
+elem.tree=_f80.tree;
 });
-_f71.parent=this;
+_f7e.parent=this;
 if(this.isTreeNode){
 this.state=this.loadStates.LOADED;
 }
-if(_f72<this.children.length){
-dojo.html.insertBefore(_f71.domNode,this.children[_f72].domNode);
+if(_f7f<this.children.length){
+dojo.html.insertBefore(_f7e.domNode,this.children[_f7f].domNode);
 }else{
-this.containerNode.appendChild(_f71.domNode);
+this.containerNode.appendChild(_f7e.domNode);
 if(this.isExpanded&&this.isTreeNode){
 this.showChildren();
 }
 }
-this.children.splice(_f72,0,_f71);
-if(_f71.domNodeInitialized){
+this.children.splice(_f7f,0,_f7e);
+if(_f7e.domNodeInitialized){
 var d=this.isTreeNode?this.depth:-1;
-_f71.adjustDepth(d-_f71.depth+1);
-_f71.updateIconTree();
+_f7e.adjustDepth(d-_f7e.depth+1);
+_f7e.updateIconTree();
 }else{
-_f71.depth=this.isTreeNode?this.depth+1:0;
-_f71.createDOMNode(_f71.tree,_f71.depth);
+_f7e.depth=this.isTreeNode?this.depth+1:0;
+_f7e.createDOMNode(_f7e.tree,_f7e.depth);
 }
-var _f76=_f71.getPreviousSibling();
-if(_f71.isLastChild()&&_f76){
-_f76.updateExpandGridColumn();
+var _f83=_f7e.getPreviousSibling();
+if(_f7e.isLastChild()&&_f83){
+_f83.updateExpandGridColumn();
 }
 },makeBlankImg:function(){
 var img=document.createElement("img");
@@ -18583,50 +18629,50 @@ this.children[i].updateIconTree();
 }
 },toString:function(){
 return "["+this.widgetType+" ID:"+this.widgetId+"]";
-},move:function(_f79,_f7a,_f7b){
-var _f7c=_f79.parent;
-var _f7d=_f79.tree;
+},move:function(_f86,_f87,_f88){
+var _f89=_f86.parent;
+var _f8a=_f86.tree;
 this.doMove.apply(this,arguments);
-var _f7a=_f79.parent;
-var _f7e=_f79.tree;
-var _f7f={oldParent:_f7c,oldTree:_f7d,newParent:_f7a,newTree:_f7e,child:_f79};
-dojo.event.topic.publish(_f7d.eventNames.moveFrom,_f7f);
-dojo.event.topic.publish(_f7e.eventNames.moveTo,_f7f);
-},doMove:function(_f80,_f81,_f82){
-_f80.parent.doRemoveNode(_f80);
-_f81.doAddChild(_f80,_f82);
-},removeNode:function(_f83){
-if(!_f83.parent){
+var _f87=_f86.parent;
+var _f8b=_f86.tree;
+var _f8c={oldParent:_f89,oldTree:_f8a,newParent:_f87,newTree:_f8b,child:_f86};
+dojo.event.topic.publish(_f8a.eventNames.moveFrom,_f8c);
+dojo.event.topic.publish(_f8b.eventNames.moveTo,_f8c);
+},doMove:function(_f8d,_f8e,_f8f){
+_f8d.parent.doRemoveNode(_f8d);
+_f8e.doAddChild(_f8d,_f8f);
+},removeNode:function(_f90){
+if(!_f90.parent){
 return;
 }
-var _f84=_f83.tree;
-var _f85=_f83.parent;
-var _f86=this.doRemoveNode.apply(this,arguments);
-dojo.event.topic.publish(this.tree.eventNames.removeNode,{child:_f86,tree:_f84,parent:_f85});
-return _f86;
-},doRemoveNode:function(_f87){
-if(!_f87.parent){
+var _f91=_f90.tree;
+var _f92=_f90.parent;
+var _f93=this.doRemoveNode.apply(this,arguments);
+dojo.event.topic.publish(this.tree.eventNames.removeNode,{child:_f93,tree:_f91,parent:_f92});
+return _f93;
+},doRemoveNode:function(_f94){
+if(!_f94.parent){
 return;
 }
-var _f88=_f87.parent;
-var _f89=_f88.children;
-var _f8a=_f87.getParentIndex();
-if(_f8a<0){
-dojo.raise("Couldn't find node "+_f87+" for removal");
+var _f95=_f94.parent;
+var _f96=_f95.children;
+var _f97=_f94.getParentIndex();
+if(_f97<0){
+dojo.raise("Couldn't find node "+_f94+" for removal");
 }
-_f89.splice(_f8a,1);
-dojo.html.removeNode(_f87.domNode);
-if(_f88.children.length==0&&!_f88.isTree){
-_f88.containerNode.style.display="none";
+_f96.splice(_f97,1);
+dojo.html.removeNode(_f94.domNode);
+if(_f95.children.length==0&&!_f95.isTree){
+_f95.containerNode.style.display="none";
 }
-if(_f8a==_f89.length&&_f8a>0){
-_f89[_f8a-1].updateExpandGridColumn();
+if(_f97==_f96.length&&_f97>0){
+_f96[_f97-1].updateExpandGridColumn();
 }
-if(_f88 instanceof dojo.widget.Tree&&_f8a==0&&_f89.length>0){
-_f89[0].updateExpandGrid();
+if(_f95 instanceof dojo.widget.Tree&&_f97==0&&_f96.length>0){
+_f96[0].updateExpandGrid();
 }
-_f87.parent=_f87.tree=null;
-return _f87;
+_f94.parent=_f94.tree=null;
+return _f94;
 },markLoading:function(){
 },unMarkLoading:function(){
 },lock:function(){
@@ -18665,16 +18711,16 @@ if(!dojo.string.isBlank(this.href)){
 dojo.io.bind({url:this.href,useCache:false,preventCache:true,handler:function(type,data,e){
 if(type=="load"){
 if(data){
-dojo.lang.forEach(data,function(_f90){
-var _f91=dojo.widget.createWidget("struts:StrutsTreeNode",{title:_f90.label,isFolder:_f90.hasChildren,widgetId:_f90.id});
-self.addChild(_f91);
+dojo.lang.forEach(data,function(_f9d){
+var _f9e=dojo.widget.createWidget("struts:StrutsTreeNode",{title:_f9d.label,isFolder:_f9d.hasChildren,widgetId:_f9d.id});
+self.addChild(_f9e);
 });
 }
 }else{
 if(self.errorNotifyTopicsArray){
-dojo.lang.forEach(self.errorNotifyTopicsArray,function(_f92){
+dojo.lang.forEach(self.errorNotifyTopicsArray,function(_f9f){
 try{
-dojo.event.topic.publish(_f92,data,e,self);
+dojo.event.topic.publish(_f9f,data,e,self);
 }
 catch(ex){
 dojo.debug(ex);
diff --git a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js
index 8ca222da3..7694fbbbc 100644
--- a/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js
+++ b/plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js
@@ -22061,6 +22061,7 @@ dojo.widget.defineWidget(
   dojo.widget.HtmlWidget, {
   widgetType : "Bind",
   executeScripts : false,
+  scriptSeparation : false,
   targets : "",
   targetsArray : null,
   href : "",
@@ -22098,6 +22099,13 @@ dojo.widget.defineWidget(
   validate : false,
   ajaxAfterValidation : false,
   
+  //used for scripts downloading & caching
+  cacheContent : true,
+  //run script on its own scope
+  scriptSeparation : true,
+  //scope for the cript separation
+  scriptScope : null,
+   
   postCreate : function() {
     var self = this;
 
@@ -22235,14 +22243,7 @@ dojo.widget.defineWidget(
       if(this.executeScripts) {
         //update targets content
         var parsed = this.parse(data);
-        //eval scripts
-        if(parsed.scripts && parsed.scripts.length > 0) {
-          var scripts = "";
-          for(var i = 0; i < parsed.scripts.length; i++){
-            scripts += parsed.scripts[i];
-          }
-          (new Function('_container_', scripts+'; return this;'))(this);
-        }
+        this._executeScripts(parsed.scripts);
         this.setContent(parsed.text);
       }
       else {
@@ -22417,7 +22418,65 @@ dojo.widget.defineWidget(
       text: s,
       scripts: scripts
     };
-  }
+  }, 
+  
+  //from Dojo content pane
+  _executeScripts : function (scripts) {
+    var self = this;
+    var tmp = "", code = "";
+    for (var i = 0; i < scripts.length; i++) {
+        if (scripts[i].path) {
+            dojo.io.bind(this._cacheSetting({"url":scripts[i].path, "load":function (type, scriptStr) {
+                dojo.lang.hitch(self, tmp = ";" + scriptStr);
+            }, "error":function (type, error) {
+                error.text = type + " downloading remote script";
+                self._handleDefaults.call(self, error, "onExecError", "debug");
+            }, "mimetype":"text/plain", "sync":true}, this.cacheContent));
+            code += tmp;
+        } else {
+            code += scripts[i];
+        }
+    }
+    try {
+        if (this.scriptSeparation) {
+            delete this.scriptScope;
+            this.scriptScope = new (new Function("_container_", code + "; return this;"))(self);
+        } else {
+            var djg = dojo.global();
+            if (djg.execScript) {
+                djg.execScript(code);
+            } else {
+                var djd = dojo.doc();
+                var sc = djd.createElement("script");
+                sc.appendChild(djd.createTextNode(code));
+                (this.containerNode || this.domNode).appendChild(sc);
+            }
+        }
+    }
+    catch (e) {
+        e.text = "Error running scripts from content:\n" + e.description;
+        this.log(e);
+    }
+ },
+ 
+ _cacheSetting : function (bindObj, useCache) {
+    for (var x in this.bindArgs) {
+        if (dojo.lang.isUndefined(bindObj[x])) {
+            bindObj[x] = this.bindArgs[x];
+        }
+    }
+    if (dojo.lang.isUndefined(bindObj.useCache)) {
+        bindObj.useCache = useCache;
+    }
+    if (dojo.lang.isUndefined(bindObj.preventCache)) {
+        bindObj.preventCache = !useCache;
+    }
+    if (dojo.lang.isUndefined(bindObj.mimetype)) {
+        bindObj.mimetype = "text/html";
+    }
+    return bindObj;
+ }
+ 
 });
 
 
@@ -22774,7 +22833,7 @@ dojo.widget.defineWidget(
     },
     
     //from Dojo's ContentPane
-    //TODO: remove when fixed on Dojo
+    //TODO: remove when fixed on Dojo (WW-1869)
     splitAndFixPaths:function (s, url) {
       var titles = [], scripts = [], tmp = [];
       var match = [], requires = [], attr = [], styles = [];
diff --git a/plugins/dojo/src/main/resources/template/ajax/ajax-common.ftl b/plugins/dojo/src/main/resources/template/ajax/ajax-common.ftl
index f75fc3689..4619ddc8a 100644
--- a/plugins/dojo/src/main/resources/template/ajax/ajax-common.ftl
+++ b/plugins/dojo/src/main/resources/template/ajax/ajax-common.ftl
@@ -73,3 +73,6 @@
   <#if parameters.highlightDuration?if_exists != "">
     highlightDuration="${parameters.highlightDuration?html}"<#rt/>
   </#if>
+  <#if parameters.separateScripts?exists>
+    scriptSeparation="${parameters.separateScripts?string?html}"<#rt/>
+  </#if>
diff --git a/plugins/dojo/src/main/resources/template/ajax/bind.ftl b/plugins/dojo/src/main/resources/template/ajax/bind.ftl
index 4578788a6..114d2fe5c 100644
--- a/plugins/dojo/src/main/resources/template/ajax/bind.ftl
+++ b/plugins/dojo/src/main/resources/template/ajax/bind.ftl
@@ -70,6 +70,9 @@
 			<#else>
 			    "ajaxAfterValidation": false,    
 			</#if>
+			<#if parameters.separateScripts?exists>
+                "scriptSeparation": ${parameters.separateScripts?string?html},<#rt/>
+            </#if>
 		});
 	});
 </script>
\ No newline at end of file
diff --git a/plugins/dojo/src/main/resources/template/ajax/div.ftl b/plugins/dojo/src/main/resources/template/ajax/div.ftl
index f71531955..1d1b41a8b 100644
--- a/plugins/dojo/src/main/resources/template/ajax/div.ftl
+++ b/plugins/dojo/src/main/resources/template/ajax/div.ftl
@@ -20,9 +20,6 @@
   <#if parameters.refreshOnShow?exists>
     refreshOnShow="${parameters.refreshOnShow?string?html}"<#rt/>
   </#if>
-  <#if parameters.separateScripts?exists>
-    scriptSeparation="${parameters.separateScripts?string?html}"<#rt/>
-  </#if>
   <#if parameters.preload?exists>
     preload="${parameters.preload?string?html}"<#rt/>
   </#if>
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTest.java
index 3251dbc60..e6b0e7577 100644
--- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTest.java
+++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/AnchorTest.java
@@ -52,6 +52,7 @@ public class AnchorTest extends AbstractUITagTest {
         tag.setHighlightDuration("n");
         tag.setValidate("true");
         tag.setAjaxAfterValidation("true");
+        tag.setSeparateScripts("true");
         tag.doStartTag();
         tag.doEndTag();
 
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/BindTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/BindTest.java
index 6189cb312..5c1e14a1b 100644
--- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/BindTest.java
+++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/BindTest.java
@@ -27,6 +27,7 @@ public class BindTest extends AbstractUITagTest {
         tag.setHighlightColor("p");
         tag.setHighlightDuration("q");
         tag.setValidate("true");
+        tag.setSeparateScripts("true");
         tag.doStartTag();
         tag.doEndTag();
 
diff --git a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/SubmitAjaxTest.java b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/SubmitAjaxTest.java
index b49cacf08..e539ebc9b 100644
--- a/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/SubmitAjaxTest.java
+++ b/plugins/dojo/src/test/java/org/apache/struts2/dojo/views/jsp/ui/SubmitAjaxTest.java
@@ -48,6 +48,7 @@ public class SubmitAjaxTest extends AbstractUITagTest {
         tag.setHighlightDuration("o");
         tag.setValidate("true");
         tag.setAjaxAfterValidation("true");
+        tag.setSeparateScripts("true");
         tag.setTabindex("1");
         tag.doStartTag();
         tag.doEndTag();
@@ -77,6 +78,7 @@ public class SubmitAjaxTest extends AbstractUITagTest {
         tag.setIndicator("l");
         tag.setErrorNotifyTopics("m");
         tag.setValidate("true");
+        tag.setSeparateScripts("true");
         tag.setTabindex("1");
         tag.doStartTag();
         tag.doEndTag();
@@ -107,6 +109,7 @@ public class SubmitAjaxTest extends AbstractUITagTest {
         tag.setIndicator("l");
         tag.setErrorNotifyTopics("m");
         tag.setValidate("true");
+        tag.setSeparateScripts("true");
         tag.doStartTag();
         tag.doEndTag();
 
diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Bind-1.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Bind-1.txt
index ba047727a..141142161 100644
--- a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Bind-1.txt
+++ b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/Bind-1.txt
@@ -20,6 +20,7 @@
 			"highlightDuration":q,
 			"validate": true,
 			"ajaxAfterValidation":false,
+			"scriptSeparation": true,
 		});
 	});
 </script>
\ No newline at end of file
diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/div-1.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/div-1.txt
index 490792ba9..bf9d87a34 100644
--- a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/div-1.txt
+++ b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/div-1.txt
@@ -7,7 +7,6 @@
   startTimerListenTopics="h"
   stopTimerListenTopics="i"
   refreshOnShow="true"
-  scriptSeparation="false"
   id="mylabel"
   href="a"
   loadingText="b"
@@ -21,5 +20,6 @@
   showError="true"
   showLoading="true"
   highlightColor="o"
-  highlightDuration="p">
+  highlightDuration="p"
+  scriptSeparation="false">
 </div>
diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/href-1.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/href-1.txt
index 5512d19bd..a2a059fd9 100644
--- a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/href-1.txt
+++ b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/href-1.txt
@@ -17,5 +17,6 @@
  showError="true"
  showLoading="true"
  highlightColor="m"
- highlightDuration="n">
+ highlightDuration="n"
+ scriptSeparation="true">
 </a>
diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-1.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-1.txt
index 66c84b00a..09aad1df4 100644
--- a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-1.txt
+++ b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-1.txt
@@ -21,4 +21,5 @@
   showLoading="true"
   highlightColor="n"
   highlightDuration="o"
+  scriptSeparation="true"
   />
diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-2.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-2.txt
index 2c730cd68..82072612f 100644
--- a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-2.txt
+++ b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-2.txt
@@ -15,5 +15,6 @@
   errorNotifyTopics="m"
   handler="h"
   indicator="l"
+  scriptSeparation="true"
   value="i"
   />
\ No newline at end of file
diff --git a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-3.txt b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-3.txt
index 9ca11cb09..158fce385 100644
--- a/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-3.txt
+++ b/plugins/dojo/src/test/resources/org/apache/struts2/dojo/views/jsp/ui/submit-ajax-3.txt
@@ -19,4 +19,5 @@
   errorNotifyTopics="m"
   handler="h"
   indicator="l"
+  scriptSeparation="true"
   />
\ No newline at end of file