diff --git a/spring-js/src/main/resources/META-INF/dijit/ColorPalette.js b/spring-js/src/main/resources/META-INF/dijit/ColorPalette.js index a1edf332..05f4f8d3 100644 --- a/spring-js/src/main/resources/META-INF/dijit/ColorPalette.js +++ b/spring-js/src/main/resources/META-INF/dijit/ColorPalette.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dijit.ColorPalette"]){dojo._hasResource["dijit.ColorPalette"]=true;dojo.provide("dijit.ColorPalette");dojo.require("dijit._Widget");dojo.require("dijit._Templated");dojo.require("dojo.colors");dojo.require("dojo.i18n");dojo.requireLocalization("dojo","colors",null,"ROOT,cs,de,es,fr,hu,it,ja,ko,pl,pt,ru,zh,zh-tw");dojo.declare("dijit.ColorPalette",[dijit._Widget,dijit._Templated],{defaultTimeout:500,timeoutChangeRate:0.9,palette:"7x10",value:null,_currentFocus:0,_xDim:null,_yDim:null,_palettes:{"7x10":[["white","seashell","cornsilk","lemonchiffon","lightyellow","palegreen","paleturquoise","lightcyan","lavender","plum"],["lightgray","pink","bisque","moccasin","khaki","lightgreen","lightseagreen","lightskyblue","cornflowerblue","violet"],["silver","lightcoral","sandybrown","orange","palegoldenrod","chartreuse","mediumturquoise","skyblue","mediumslateblue","orchid"],["gray","red","orangered","darkorange","yellow","limegreen","darkseagreen","royalblue","slateblue","mediumorchid"],["dimgray","crimson","chocolate","coral","gold","forestgreen","seagreen","blue","blueviolet","darkorchid"],["darkslategray","firebrick","saddlebrown","sienna","olive","green","darkcyan","mediumblue","darkslateblue","darkmagenta"],["black","darkred","maroon","brown","darkolivegreen","darkgreen","midnightblue","navy","indigo","purple"]],"3x4":[["white","lime","green","blue"],["silver","yellow","fuchsia","navy"],["gray","red","purple","black"]]},_imagePaths:{"7x10":dojo.moduleUrl("dijit","templates/colors7x10.png"),"3x4":dojo.moduleUrl("dijit","templates/colors3x4.png")},_paletteCoords:{"leftOffset":4,"topOffset":4,"cWidth":20,"cHeight":20},templateString:"
\n\t
\n\t\t\n\t
\t\n
\n",_paletteDims:{"7x10":{"width":"206px","height":"145px"},"3x4":{"width":"86px","height":"64px"}},postCreate:function(){dojo.mixin(this.divNode.style,this._paletteDims[this.palette]);this.imageNode.setAttribute("src",this._imagePaths[this.palette]);var _1=this._palettes[this.palette];this.domNode.style.position="relative";this._highlightNodes=[];this.colorNames=dojo.i18n.getLocalization("dojo","colors",this.lang);var _2=dojo.moduleUrl("dijit","templates/blank.gif");var _3=new dojo.Color(),_4=this._paletteCoords;for(var _5=0;_5<_1.length;_5++){for(var _6=0;_6<_1[_5].length;_6++){var _7=document.createElement("img");_7.src=_2;dojo.addClass(_7,"dijitPaletteImg");var _8=_1[_5][_6],_9=_3.setColor(dojo.Color.named[_8]);_7.alt=this.colorNames[_8];_7.color=_9.toHex();var _a=_7.style;_a.color=_a.backgroundColor=_7.color;dojo.forEach(["Dijitclick","MouseOut","MouseOver","Blur","Focus"],function(_b){this.connect(_7,"on"+_b.toLowerCase(),"_onColor"+_b);},this);this.divNode.appendChild(_7);_a.top=_4.topOffset+(_5*_4.cHeight)+"px";_a.left=_4.leftOffset+(_6*_4.cWidth)+"px";_7.setAttribute("tabIndex","-1");_7.title=this.colorNames[_8];dijit.setWaiRole(_7,"gridcell");_7.index=this._highlightNodes.length;this._highlightNodes.push(_7);}}this._highlightNodes[this._currentFocus].tabIndex=0;this._xDim=_1[0].length;this._yDim=_1.length;var _c={UP_ARROW:-this._xDim,DOWN_ARROW:this._xDim,RIGHT_ARROW:1,LEFT_ARROW:-1};for(var _d in _c){this._connects.push(dijit.typematic.addKeyListener(this.domNode,{keyCode:dojo.keys[_d],ctrlKey:false,altKey:false,shiftKey:false},this,function(){var _e=_c[_d];return function(_f){this._navigateByKey(_e,_f);};}(),this.timeoutChangeRate,this.defaultTimeout));}},focus:function(){dijit.focus(this._highlightNodes[this._currentFocus]);},onChange:function(_10){},_onColorDijitclick:function(evt){var _12=evt.currentTarget;if(this._currentFocus!=_12.index){this._currentFocus=_12.index;dijit.focus(_12);}this._selectColor(_12);dojo.stopEvent(evt);},_onColorMouseOut:function(evt){dojo.removeClass(evt.currentTarget,"dijitPaletteImgHighlight");},_onColorMouseOver:function(evt){var _15=evt.currentTarget;_15.tabIndex=0;_15.focus();},_onColorBlur:function(evt){dojo.removeClass(evt.currentTarget,"dijitPaletteImgHighlight");evt.currentTarget.tabIndex=-1;this._currentFocus=0;this._highlightNodes[0].tabIndex=0;},_onColorFocus:function(evt){if(this._currentFocus!=evt.currentTarget.index){this._highlightNodes[this._currentFocus].tabIndex=-1;}this._currentFocus=evt.currentTarget.index;dojo.addClass(evt.currentTarget,"dijitPaletteImgHighlight");},_selectColor:function(_18){this.onChange(this.value=_18.color);},_navigateByKey:function(_19,_1a){if(_1a==-1){return;}var _1b=this._currentFocus+_19;if(_1b-1){var _1c=this._highlightNodes[_1b];_1c.tabIndex=0;_1c.focus();}}});} \ No newline at end of file +if(!dojo._hasResource["dijit.ColorPalette"]){dojo._hasResource["dijit.ColorPalette"]=true;dojo.provide("dijit.ColorPalette");dojo.require("dijit._Widget");dojo.require("dijit._Templated");dojo.require("dojo.colors");dojo.require("dojo.i18n");dojo.requireLocalization("dojo","colors",null,"ar,ca,ROOT,cs,da,de,el,es,fi,fr,he,hu,it,ja,ko,nb,nl,pl,pt,pt-pt,ru,sk,sl,sv,th,tr,zh,zh-tw");dojo.declare("dijit.ColorPalette",[dijit._Widget,dijit._Templated],{defaultTimeout:500,timeoutChangeRate:0.9,palette:"7x10",value:null,_currentFocus:0,_xDim:null,_yDim:null,_palettes:{"7x10":[["white","seashell","cornsilk","lemonchiffon","lightyellow","palegreen","paleturquoise","lightcyan","lavender","plum"],["lightgray","pink","bisque","moccasin","khaki","lightgreen","lightseagreen","lightskyblue","cornflowerblue","violet"],["silver","lightcoral","sandybrown","orange","palegoldenrod","chartreuse","mediumturquoise","skyblue","mediumslateblue","orchid"],["gray","red","orangered","darkorange","yellow","limegreen","darkseagreen","royalblue","slateblue","mediumorchid"],["dimgray","crimson","chocolate","coral","gold","forestgreen","seagreen","blue","blueviolet","darkorchid"],["darkslategray","firebrick","saddlebrown","sienna","olive","green","darkcyan","mediumblue","darkslateblue","darkmagenta"],["black","darkred","maroon","brown","darkolivegreen","darkgreen","midnightblue","navy","indigo","purple"]],"3x4":[["white","lime","green","blue"],["silver","yellow","fuchsia","navy"],["gray","red","purple","black"]]},_imagePaths:{"7x10":dojo.moduleUrl("dijit.themes","a11y/colors7x10.png"),"3x4":dojo.moduleUrl("dijit.themes","a11y/colors3x4.png")},_paletteCoords:{"leftOffset":3,"topOffset":3,"cWidth":20,"cHeight":20},templateString:"
\n\t
\n\t\t\n\t
\t\n
\n",_paletteDims:{"7x10":{"width":"206px","height":"145px"},"3x4":{"width":"86px","height":"64px"}},tabIndex:"0",postCreate:function(){dojo.mixin(this.divNode.style,this._paletteDims[this.palette]);this.imageNode.setAttribute("src",this._imagePaths[this.palette]);var _1=this._palettes[this.palette];this.domNode.style.position="relative";this._cellNodes=[];this.colorNames=dojo.i18n.getLocalization("dojo","colors",this.lang);var _2=this._blankGif,_3=new dojo.Color(),_4=this._paletteCoords;for(var _5=0;_5<_1.length;_5++){for(var _6=0;_6<_1[_5].length;_6++){var _7=dojo.doc.createElement("img");_7.src=_2;dojo.addClass(_7,"dijitPaletteImg");var _8=_1[_5][_6],_9=_3.setColor(dojo.Color.named[_8]);_7.alt=this.colorNames[_8];_7.color=_9.toHex();var _a=_7.style;_a.color=_a.backgroundColor=_7.color;var _b=dojo.doc.createElement("span");_b.appendChild(_7);dojo.forEach(["Dijitclick","MouseEnter","Focus","Blur"],function(_c){this.connect(_b,"on"+_c.toLowerCase(),"_onCell"+_c);},this);this.divNode.appendChild(_b);var _d=_b.style;_d.top=_4.topOffset+(_5*_4.cHeight)+"px";_d.left=_4.leftOffset+(_6*_4.cWidth)+"px";dojo.attr(_b,"tabindex","-1");_b.title=this.colorNames[_8];dojo.addClass(_b,"dijitPaletteCell");dijit.setWaiRole(_b,"gridcell");_b.index=this._cellNodes.length;this._cellNodes.push(_b);}}this._xDim=_1[0].length;this._yDim=_1.length;this.connect(this.divNode,"onfocus","_onDivNodeFocus");var _e={UP_ARROW:-this._xDim,DOWN_ARROW:this._xDim,RIGHT_ARROW:1,LEFT_ARROW:-1};for(var _f in _e){this._connects.push(dijit.typematic.addKeyListener(this.domNode,{charOrCode:dojo.keys[_f],ctrlKey:false,altKey:false,shiftKey:false},this,function(){var _10=_e[_f];return function(_11){this._navigateByKey(_10,_11);};}(),this.timeoutChangeRate,this.defaultTimeout));}},focus:function(){this._focusFirst();},onChange:function(_12){},_focusFirst:function(){this._currentFocus=0;var _13=this._cellNodes[this._currentFocus];window.setTimeout(function(){dijit.focus(_13);},0);},_onDivNodeFocus:function(evt){if(evt.target===this.divNode){this._focusFirst();}},_onFocus:function(){dojo.attr(this.divNode,"tabindex","-1");},_onBlur:function(){this._removeCellHighlight(this._currentFocus);dojo.attr(this.divNode,"tabindex",this.tabIndex);},_onCellDijitclick:function(evt){var _16=evt.currentTarget;if(this._currentFocus!=_16.index){this._currentFocus=_16.index;window.setTimeout(function(){dijit.focus(_16);},0);}this._selectColor(_16);dojo.stopEvent(evt);},_onCellMouseEnter:function(evt){var _18=evt.currentTarget;this._setCurrent(_18);window.setTimeout(function(){dijit.focus(_18);},0);},_onCellFocus:function(evt){this._setCurrent(evt.currentTarget);},_setCurrent:function(_1a){this._removeCellHighlight(this._currentFocus);this._currentFocus=_1a.index;dojo.addClass(_1a,"dijitPaletteCellHighlight");},_onCellBlur:function(evt){this._removeCellHighlight(this._currentFocus);},_removeCellHighlight:function(_1c){dojo.removeClass(this._cellNodes[_1c],"dijitPaletteCellHighlight");},_selectColor:function(_1d){var img=_1d.getElementsByTagName("img")[0];this.onChange(this.value=img.color);},_navigateByKey:function(_1f,_20){if(_20==-1){return;}var _21=this._currentFocus+_1f;if(_21-1){var _22=this._cellNodes[_21];_22.focus();}}});} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/Declaration.js b/spring-js/src/main/resources/META-INF/dijit/Declaration.js index b86670d8..d9183f75 100644 --- a/spring-js/src/main/resources/META-INF/dijit/Declaration.js +++ b/spring-js/src/main/resources/META-INF/dijit/Declaration.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dijit.Declaration"]){dojo._hasResource["dijit.Declaration"]=true;dojo.provide("dijit.Declaration");dojo.require("dijit._Widget");dojo.require("dijit._Templated");dojo.declare("dijit.Declaration",dijit._Widget,{_noScript:true,widgetClass:"",replaceVars:true,defaults:null,mixins:[],buildRendering:function(){var _1=this.srcNodeRef.parentNode.removeChild(this.srcNodeRef);var _2=dojo.query("> script[type='dojo/method'][event='preamble']",_1).orphan();var _3=dojo.query("> script[type^='dojo/']",_1).orphan();var _4=_1.nodeName;var _5=this.defaults||{};this.mixins=this.mixins.length?dojo.map(this.mixins,function(_6){return dojo.getObject(_6);}):[dijit._Widget,dijit._Templated];if(_2.length){_5.preamble=dojo.parser._functionFromScript(_2[0]);}var _7=dojo.map(_3,function(s){var _9=s.getAttribute("event")||"postscript";return {event:_9,func:dojo.parser._functionFromScript(s)};});this.mixins.push(function(){dojo.forEach(_7,function(s){dojo.connect(this,s.event,this,s.func);},this);});_5.widgetsInTemplate=true;_5._skipNodeCache=true;_5.templateString="<"+_4+" class='"+_1.className+"' dojoAttachPoint='"+(_1.getAttribute("dojoAttachPoint")||"")+"' dojoAttachEvent='"+(_1.getAttribute("dojoAttachEvent")||"")+"' >"+_1.innerHTML.replace(/\%7B/g,"{").replace(/\%7D/g,"}")+"";dojo.query("[dojoType]",_1).forEach(function(_b){_b.removeAttribute("dojoType");});dojo.declare(this.widgetClass,this.mixins,_5);}});} \ No newline at end of file +if(!dojo._hasResource["dijit.Declaration"]){dojo._hasResource["dijit.Declaration"]=true;dojo.provide("dijit.Declaration");dojo.require("dijit._Widget");dojo.require("dijit._Templated");dojo.declare("dijit.Declaration",dijit._Widget,{_noScript:true,widgetClass:"",replaceVars:true,defaults:null,mixins:[],buildRendering:function(){var _1=this.srcNodeRef.parentNode.removeChild(this.srcNodeRef),_2=dojo.query("> script[type='dojo/method'][event='preamble']",_1).orphan(),_3=dojo.query("> script[type^='dojo/method'][event]",_1).orphan(),_4=dojo.query("> script[type^='dojo/method']",_1).orphan(),_5=dojo.query("> script[type^='dojo/connect']",_1).orphan(),_6=_1.nodeName;var _7=this.defaults||{};dojo.forEach(_3,function(s){var _9=s.getAttribute("event"),_a=dojo.parser._functionFromScript(s);_7[_9]=_a;});this.mixins=this.mixins.length?dojo.map(this.mixins,function(_b){return dojo.getObject(_b);}):[dijit._Widget,dijit._Templated];_7.widgetsInTemplate=true;_7._skipNodeCache=true;_7.templateString="<"+_6+" class='"+_1.className+"' dojoAttachPoint='"+(_1.getAttribute("dojoAttachPoint")||"")+"' dojoAttachEvent='"+(_1.getAttribute("dojoAttachEvent")||"")+"' >"+_1.innerHTML.replace(/\%7B/g,"{").replace(/\%7D/g,"}")+"";dojo.query("[dojoType]",_1).forEach(function(_c){_c.removeAttribute("dojoType");});var wc=dojo.declare(this.widgetClass,this.mixins,_7);var _e=_5.concat(_4);dojo.forEach(_e,function(s){var evt=s.getAttribute("event")||"postscript",_11=dojo.parser._functionFromScript(s);dojo.connect(wc.prototype,evt,_11);});}});} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/Dialog.js b/spring-js/src/main/resources/META-INF/dijit/Dialog.js index 115f0c75..135abbfa 100644 --- a/spring-js/src/main/resources/META-INF/dijit/Dialog.js +++ b/spring-js/src/main/resources/META-INF/dijit/Dialog.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dijit.Dialog"]){dojo._hasResource["dijit.Dialog"]=true;dojo.provide("dijit.Dialog");dojo.require("dojo.dnd.move");dojo.require("dojo.fx");dojo.require("dijit._Widget");dojo.require("dijit._Templated");dojo.require("dijit.layout.ContentPane");dojo.require("dijit.form.Form");dojo.declare("dijit.DialogUnderlay",[dijit._Widget,dijit._Templated],{templateString:"
",postCreate:function(){dojo.body().appendChild(this.domNode);this.bgIframe=new dijit.BackgroundIframe(this.domNode);},layout:function(){var _1=dijit.getViewport();var is=this.node.style,os=this.domNode.style;os.top=_1.t+"px";os.left=_1.l+"px";is.width=_1.w+"px";is.height=_1.h+"px";var _4=dijit.getViewport();if(_1.w!=_4.w){is.width=_4.w+"px";}if(_1.h!=_4.h){is.height=_4.h+"px";}},show:function(){this.domNode.style.display="block";this.layout();if(this.bgIframe.iframe){this.bgIframe.iframe.style.display="block";}this._resizeHandler=this.connect(window,"onresize","layout");},hide:function(){this.domNode.style.display="none";if(this.bgIframe.iframe){this.bgIframe.iframe.style.display="none";}this.disconnect(this._resizeHandler);},uninitialize:function(){if(this.bgIframe){this.bgIframe.destroy();}}});dojo.declare("dijit.Dialog",[dijit.layout.ContentPane,dijit._Templated,dijit.form._FormMixin],{templateString:null,templateString:"
\n\t
\n\t${title}\n\t\n\t\tx\n\t\n\t
\n\t\t
\n\t\n
\n",open:false,duration:400,_lastFocusItem:null,attributeMap:dojo.mixin(dojo.clone(dijit._Widget.prototype.attributeMap),{title:"titleBar"}),postCreate:function(){dojo.body().appendChild(this.domNode);this.inherited("postCreate",arguments);this.domNode.style.display="none";this.connect(this,"onExecute","hide");this.connect(this,"onCancel","hide");},onLoad:function(){this._position();this.inherited("onLoad",arguments);},_setup:function(){this._modalconnects=[];if(this.titleBar){this._moveable=new dojo.dnd.Moveable(this.domNode,{handle:this.titleBar});}this._underlay=new dijit.DialogUnderlay();var _5=this.domNode;this._fadeIn=dojo.fx.combine([dojo.fadeIn({node:_5,duration:this.duration}),dojo.fadeIn({node:this._underlay.domNode,duration:this.duration,onBegin:dojo.hitch(this._underlay,"show")})]);this._fadeOut=dojo.fx.combine([dojo.fadeOut({node:_5,duration:this.duration,onEnd:function(){_5.style.display="none";}}),dojo.fadeOut({node:this._underlay.domNode,duration:this.duration,onEnd:dojo.hitch(this._underlay,"hide")})]);},uninitialize:function(){if(this._underlay){this._underlay.destroy();}},_position:function(){if(dojo.hasClass(dojo.body(),"dojoMove")){return;}var _6=dijit.getViewport();var mb=dojo.marginBox(this.domNode);var _8=this.domNode.style;_8.left=Math.floor((_6.l+(_6.w-mb.w)/2))+"px";_8.top=Math.floor((_6.t+(_6.h-mb.h)/2))+"px";},_findLastFocus:function(_9){this._lastFocused=_9.target;},_cycleFocus:function(_a){if(!this._lastFocusItem){this._lastFocusItem=this._lastFocused;}this.titleBar.focus();},_onKey:function(_b){if(_b.keyCode){var _c=_b.target;if(_c==this.titleBar&&_b.shiftKey&&_b.keyCode==dojo.keys.TAB){if(this._lastFocusItem){this._lastFocusItem.focus();}dojo.stopEvent(_b);}else{while(_c){if(_c==this.domNode){if(_b.keyCode==dojo.keys.ESCAPE){this.hide();}else{return;}}_c=_c.parentNode;}if(_b.keyCode!=dojo.keys.TAB){dojo.stopEvent(_b);}else{if(!dojo.isOpera){try{this.titleBar.focus();}catch(e){}}}}}},show:function(){if(!this._alreadyInitialized){this._setup();this._alreadyInitialized=true;}if(this._fadeOut.status()=="playing"){this._fadeOut.stop();}this._modalconnects.push(dojo.connect(window,"onscroll",this,"layout"));this._modalconnects.push(dojo.connect(document.documentElement,"onkeypress",this,"_onKey"));var ev=typeof (document.ondeactivate)=="object"?"ondeactivate":"onblur";this._modalconnects.push(dojo.connect(this.containerNode,ev,this,"_findLastFocus"));dojo.style(this.domNode,"opacity",0);this.domNode.style.display="block";this.open=true;this._loadCheck();this._position();this._fadeIn.play();this._savedFocus=dijit.getFocus(this);setTimeout(dojo.hitch(this,function(){dijit.focus(this.titleBar);}),50);},hide:function(){if(!this._alreadyInitialized){return;}if(this._fadeIn.status()=="playing"){this._fadeIn.stop();}this._fadeOut.play();if(this._scrollConnected){this._scrollConnected=false;}dojo.forEach(this._modalconnects,dojo.disconnect);this._modalconnects=[];this.connect(this._fadeOut,"onEnd",dojo.hitch(this,function(){dijit.focus(this._savedFocus);}));this.open=false;},layout:function(){if(this.domNode.style.display=="block"){this._underlay.layout();this._position();}}});dojo.declare("dijit.TooltipDialog",[dijit.layout.ContentPane,dijit._Templated,dijit.form._FormMixin],{title:"",_lastFocusItem:null,templateString:null,templateString:"
\n\t
\n\t\t
\n\t
\n\t\n\t
\n
\n",postCreate:function(){this.inherited("postCreate",arguments);this.connect(this.containerNode,"onkeypress","_onKey");var ev=typeof (document.ondeactivate)=="object"?"ondeactivate":"onblur";this.connect(this.containerNode,ev,"_findLastFocus");this.containerNode.title=this.title;},orient:function(_f){this.domNode.className="dijitTooltipDialog "+" dijitTooltipAB"+(_f.charAt(1)=="L"?"Left":"Right")+" dijitTooltip"+(_f.charAt(0)=="T"?"Below":"Above");},onOpen:function(pos){this.orient(pos.corner);this._loadCheck();this.containerNode.focus();},_onKey:function(evt){if(evt.keyCode==dojo.keys.ESCAPE){this.onCancel();}else{if(evt.target==this.containerNode&&evt.shiftKey&&evt.keyCode==dojo.keys.TAB){if(this._lastFocusItem){this._lastFocusItem.focus();}dojo.stopEvent(evt);}else{if(evt.keyCode==dojo.keys.TAB){evt.stopPropagation();}}}},_findLastFocus:function(evt){this._lastFocused=evt.target;},_cycleFocus:function(evt){if(!this._lastFocusItem){this._lastFocusItem=this._lastFocused;}this.containerNode.focus();}});} \ No newline at end of file +if(!dojo._hasResource["dijit.Dialog"]){dojo._hasResource["dijit.Dialog"]=true;dojo.provide("dijit.Dialog");dojo.require("dojo.dnd.move");dojo.require("dojo.dnd.TimedMoveable");dojo.require("dojo.fx");dojo.require("dijit._Widget");dojo.require("dijit._Templated");dojo.require("dijit.layout.ContentPane");dojo.require("dijit.form.Form");dojo.requireLocalization("dijit","common",null,"ar,ca,ROOT,cs,da,de,el,es,fi,fr,he,hu,it,ja,ko,nb,nl,pl,pt,pt-pt,ru,sk,sl,sv,th,tr,zh,zh-tw");dojo.declare("dijit.DialogUnderlay",[dijit._Widget,dijit._Templated],{templateString:"
",attributeMap:{},postCreate:function(){dojo.body().appendChild(this.domNode);this.bgIframe=new dijit.BackgroundIframe(this.domNode);},layout:function(){var _1=dijit.getViewport();var is=this.node.style,os=this.domNode.style;os.top=_1.t+"px";os.left=_1.l+"px";is.width=_1.w+"px";is.height=_1.h+"px";var _4=dijit.getViewport();if(_1.w!=_4.w){is.width=_4.w+"px";}if(_1.h!=_4.h){is.height=_4.h+"px";}},show:function(){this.domNode.style.display="block";this.layout();if(this.bgIframe.iframe){this.bgIframe.iframe.style.display="block";}},hide:function(){this.domNode.style.display="none";if(this.bgIframe.iframe){this.bgIframe.iframe.style.display="none";}},uninitialize:function(){if(this.bgIframe){this.bgIframe.destroy();}}});dojo.declare("dijit._DialogMixin",null,{attributeMap:dijit._Widget.prototype.attributeMap,execute:function(_5){},onCancel:function(){},onExecute:function(){},_onSubmit:function(){this.onExecute();this.execute(this.attr("value"));},_getFocusItems:function(_6){var _7=dijit._getTabNavigable(dojo.byId(_6));this._firstFocusItem=_7.lowest||_7.first||_6;this._lastFocusItem=_7.last||_7.highest||this._firstFocusItem;if(dojo.isMoz&&this._firstFocusItem.tagName.toLowerCase()=="input"&&dojo.attr(this._firstFocusItem,"type").toLowerCase()=="file"){dojo.attr(_6,"tabindex","0");this._firstFocusItem=_6;}}});dojo.declare("dijit.Dialog",[dijit.layout.ContentPane,dijit._Templated,dijit.form._FormMixin,dijit._DialogMixin],{templateString:null,templateString:"
\n\t
\n\t\n\t\n\t\tx\n\t\n\t
\n\t\t
\n
\n",attributeMap:dojo.mixin(dojo.clone(dijit._Widget.prototype.attributeMap),{title:[{node:"titleNode",type:"innerHTML"},{node:"titleBar",type:"attribute"}]}),open:false,duration:dijit.defaultDuration,refocus:true,autofocus:true,_firstFocusItem:null,_lastFocusItem:null,doLayout:false,draggable:true,postMixInProperties:function(){var _8=dojo.i18n.getLocalization("dijit","common");dojo.mixin(this,_8);this.inherited(arguments);},postCreate:function(){var s=this.domNode.style;s.visibility="hidden";s.position="absolute";s.display="";s.top="-9999px";dojo.body().appendChild(this.domNode);this.inherited(arguments);this.connect(this,"onExecute","hide");this.connect(this,"onCancel","hide");this._modalconnects=[];},onLoad:function(){this._position();this.inherited(arguments);},_endDrag:function(e){if(e&&e.node&&e.node===this.domNode){var vp=dijit.getViewport();var p=e._leftTop||dojo.coords(e.node,true);this._relativePosition={t:p.t-vp.t,l:p.l-vp.l};}},_setup:function(){var _d=this.domNode;if(this.titleBar&&this.draggable){this._moveable=(dojo.isIE==6)?new dojo.dnd.TimedMoveable(_d,{handle:this.titleBar}):new dojo.dnd.Moveable(_d,{handle:this.titleBar,timeout:0});dojo.subscribe("/dnd/move/stop",this,"_endDrag");}else{dojo.addClass(_d,"dijitDialogFixed");}this._underlay=new dijit.DialogUnderlay({id:this.id+"_underlay","class":dojo.map(this["class"].split(/\s/),function(s){return s+"_underlay";}).join(" ")});var _f=this._underlay;this._fadeIn=dojo.fadeIn({node:_d,duration:this.duration,onBegin:dojo.hitch(_f,"show")});this._fadeOut=dojo.fadeOut({node:_d,duration:this.duration,onEnd:function(){_d.style.visibility="hidden";_d.style.top="-9999px";_f.hide();}});},uninitialize:function(){if(this._fadeIn&&this._fadeIn.status()=="playing"){this._fadeIn.stop();}if(this._fadeOut&&this._fadeOut.status()=="playing"){this._fadeOut.stop();}if(this._underlay){this._underlay.destroy();}if(this._moveable){this._moveable.destroy();}},_size:function(){var mb=dojo.marginBox(this.domNode);var _11=dijit.getViewport();if(mb.w>=_11.w||mb.h>=_11.h){dojo.style(this.containerNode,{width:Math.min(mb.w,Math.floor(_11.w*0.75))+"px",height:Math.min(mb.h,Math.floor(_11.h*0.75))+"px",overflow:"auto",position:"relative"});}},_position:function(){if(!dojo.hasClass(dojo.body(),"dojoMove")){var _12=this.domNode;var _13=dijit.getViewport();var p=this._relativePosition;var mb=p?null:dojo.marginBox(_12);dojo.style(_12,{left:Math.floor(_13.l+(p?p.l:(_13.w-mb.w)/2))+"px",top:Math.floor(_13.t+(p?p.t:(_13.h-mb.h)/2))+"px"});}},_onKey:function(evt){if(evt.charOrCode){var dk=dojo.keys;var _18=evt.target;if(evt.charOrCode===dk.TAB){this._getFocusItems(this.domNode);}var _19=(this._firstFocusItem==this._lastFocusItem);if(_18==this._firstFocusItem&&evt.shiftKey&&evt.charOrCode===dk.TAB){if(!_19){dijit.focus(this._lastFocusItem);}dojo.stopEvent(evt);}else{if(_18==this._lastFocusItem&&evt.charOrCode===dk.TAB&&!evt.shiftKey){if(!_19){dijit.focus(this._firstFocusItem);}dojo.stopEvent(evt);}else{while(_18){if(_18==this.domNode){if(evt.charOrCode==dk.ESCAPE){this.onCancel();}else{return;}}_18=_18.parentNode;}if(evt.charOrCode!==dk.TAB){dojo.stopEvent(evt);}else{if(!dojo.isOpera){try{this._firstFocusItem.focus();}catch(e){}}}}}}},show:function(){if(this.open){return;}if(!this._alreadyInitialized){this._setup();this._alreadyInitialized=true;}if(this._fadeOut.status()=="playing"){this._fadeOut.stop();}this._modalconnects.push(dojo.connect(window,"onscroll",this,"layout"));this._modalconnects.push(dojo.connect(window,"onresize",this,"layout"));this._modalconnects.push(dojo.connect(dojo.doc.documentElement,"onkeypress",this,"_onKey"));dojo.style(this.domNode,{opacity:0,visibility:""});this.open=true;this._loadCheck();this._size();this._position();this._fadeIn.play();this._savedFocus=dijit.getFocus(this);if(this.autofocus){this._getFocusItems(this.domNode);setTimeout(dojo.hitch(dijit,"focus",this._firstFocusItem),50);}},hide:function(){if(!this._alreadyInitialized){return;}if(this._fadeIn.status()=="playing"){this._fadeIn.stop();}this._fadeOut.play();if(this._scrollConnected){this._scrollConnected=false;}dojo.forEach(this._modalconnects,dojo.disconnect);this._modalconnects=[];if(this.refocus){this.connect(this._fadeOut,"onEnd",dojo.hitch(dijit,"focus",this._savedFocus));}if(this._relativePosition){delete this._relativePosition;}this.open=false;},layout:function(){if(this.domNode.style.visibility!="hidden"){this._underlay.layout();this._position();}},destroy:function(){dojo.forEach(this._modalconnects,dojo.disconnect);if(this.refocus&&this.open){setTimeout(dojo.hitch(dijit,"focus",this._savedFocus),25);}this.inherited(arguments);}});dojo.declare("dijit.TooltipDialog",[dijit.layout.ContentPane,dijit._Templated,dijit.form._FormMixin,dijit._DialogMixin],{title:"",doLayout:false,autofocus:true,"class":"dijitTooltipDialog",_firstFocusItem:null,_lastFocusItem:null,templateString:null,templateString:"
\n\t
\n\t\t
\n\t
\n\t
\n
\n",postCreate:function(){this.inherited(arguments);this.connect(this.containerNode,"onkeypress","_onKey");this.containerNode.title=this.title;},orient:function(_1a,_1b,_1c){this.domNode.className=this["class"]+" dijitTooltipAB"+(_1c.charAt(1)=="L"?"Left":"Right")+" dijitTooltip"+(_1c.charAt(0)=="T"?"Below":"Above");},onOpen:function(pos){this.orient(this.domNode,pos.aroundCorner,pos.corner);this._loadCheck();if(this.autofocus){this._getFocusItems(this.containerNode);dijit.focus(this._firstFocusItem);}},_onKey:function(evt){var _1f=evt.target;var dk=dojo.keys;if(evt.charOrCode===dk.TAB){this._getFocusItems(this.containerNode);}var _21=(this._firstFocusItem==this._lastFocusItem);if(evt.charOrCode==dk.ESCAPE){this.onCancel();dojo.stopEvent(evt);}else{if(_1f==this._firstFocusItem&&evt.shiftKey&&evt.charOrCode===dk.TAB){if(!_21){dijit.focus(this._lastFocusItem);}dojo.stopEvent(evt);}else{if(_1f==this._lastFocusItem&&evt.charOrCode===dk.TAB&&!evt.shiftKey){if(!_21){dijit.focus(this._firstFocusItem);}dojo.stopEvent(evt);}else{if(evt.charOrCode===dk.TAB){evt.stopPropagation();}}}}}});} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/Editor.js b/spring-js/src/main/resources/META-INF/dijit/Editor.js index 66ba6eed..517aff75 100644 --- a/spring-js/src/main/resources/META-INF/dijit/Editor.js +++ b/spring-js/src/main/resources/META-INF/dijit/Editor.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dijit.Editor"]){dojo._hasResource["dijit.Editor"]=true;dojo.provide("dijit.Editor");dojo.require("dijit._editor.RichText");dojo.require("dijit.Toolbar");dojo.require("dijit._editor._Plugin");dojo.require("dijit._Container");dojo.require("dojo.i18n");dojo.requireLocalization("dijit._editor","commands",null,"ROOT,cs,de,es,fr,hu,it,ja,ko,pl,pt,ru,zh,zh-tw");dojo.declare("dijit.Editor",dijit._editor.RichText,{plugins:null,extraPlugins:null,constructor:function(){this.plugins=["undo","redo","|","cut","copy","paste","|","bold","italic","underline","strikethrough","|","insertOrderedList","insertUnorderedList","indent","outdent","|","justifyLeft","justifyRight","justifyCenter","justifyFull"];this._plugins=[];this._editInterval=this.editActionInterval*1000;},postCreate:function(){if(this.customUndo){dojo["require"]("dijit._editor.range");this._steps=this._steps.slice(0);this._undoedSteps=this._undoedSteps.slice(0);}if(dojo.isArray(this.extraPlugins)){this.plugins=this.plugins.concat(this.extraPlugins);}dijit.Editor.superclass.postCreate.apply(this,arguments);this.commands=dojo.i18n.getLocalization("dijit._editor","commands",this.lang);if(!this.toolbar){var _1=dojo.doc.createElement("div");dojo.place(_1,this.editingArea,"before");this.toolbar=new dijit.Toolbar({},_1);}dojo.forEach(this.plugins,this.addPlugin,this);this.onNormalizedDisplayChanged();},destroy:function(){dojo.forEach(this._plugins,function(p){if(p.destroy){p.destroy();}});this._plugins=[];this.toolbar.destroy();delete this.toolbar;this.inherited("destroy",arguments);},addPlugin:function(_3,_4){var _5=dojo.isString(_3)?{name:_3}:_3;if(!_5.setEditor){var o={"args":_5,"plugin":null,"editor":this};dojo.publish("dijit.Editor.getPlugin",[o]);if(!o.plugin){var pc=dojo.getObject(_5.name);if(pc){o.plugin=new pc(_5);}}if(!o.plugin){console.debug("Cannot find plugin",_3);return;}_3=o.plugin;}if(arguments.length>1){this._plugins[_4]=_3;}else{this._plugins.push(_3);}_3.setEditor(this);if(dojo.isFunction(_3.setToolbar)){_3.setToolbar(this.toolbar);}},customUndo:dojo.isIE,editActionInterval:3,beginEditing:function(_8){if(!this._inEditing){this._inEditing=true;this._beginEditing(_8);}if(this.editActionInterval>0){if(this._editTimer){clearTimeout(this._editTimer);}this._editTimer=setTimeout(dojo.hitch(this,this.endEditing),this._editInterval);}},_steps:[],_undoedSteps:[],execCommand:function(_9){if(this.customUndo&&(_9=="undo"||_9=="redo")){return this[_9]();}else{try{if(this.customUndo){this.endEditing();this._beginEditing();}var r=this.inherited("execCommand",arguments);if(this.customUndo){this._endEditing();}return r;}catch(e){if(dojo.isMoz&&/copy|cut|paste/.test(_9)){var _b=dojo.string.substitute,_c={cut:"X",copy:"C",paste:"V"},_d=navigator.userAgent.indexOf("Macintosh")!=-1;alert(_b(this.commands.systemShortcutFF,[this.commands[_9],_b(this.commands[_d?"appleKey":"ctrlKey"],[_c[_9]])]));}return false;}}},queryCommandEnabled:function(_e){if(this.customUndo&&(_e=="undo"||_e=="redo")){return _e=="undo"?(this._steps.length>1):(this._undoedSteps.length>0);}else{return this.inherited("queryCommandEnabled",arguments);}},_changeToStep:function(_f,to){this.setValue(to.text);var b=to.bookmark;if(!b){return;}if(dojo.isIE){if(dojo.isArray(b)){var tmp=[];dojo.forEach(b,function(n){tmp.push(dijit.range.getNode(n,this.editNode));},this);b=tmp;}}else{var r=dijit.range.create();r.setStart(dijit.range.getNode(b.startContainer,this.editNode),b.startOffset);r.setEnd(dijit.range.getNode(b.endContainer,this.editNode),b.endOffset);b=r;}dojo.withGlobal(this.window,"moveToBookmark",dijit,[b]);},undo:function(){this.endEditing(true);var s=this._steps.pop();if(this._steps.length>0){this.focus();this._changeToStep(s,this._steps[this._steps.length-1]);this._undoedSteps.push(s);this.onDisplayChanged();return true;}return false;},redo:function(){this.endEditing(true);var s=this._undoedSteps.pop();if(s&&this._steps.length>0){this.focus();this._changeToStep(this._steps[this._steps.length-1],s);this._steps.push(s);this.onDisplayChanged();return true;}return false;},endEditing:function(_17){if(this._editTimer){clearTimeout(this._editTimer);}if(this._inEditing){this._endEditing(_17);this._inEditing=false;}},_getBookmark:function(){var b=dojo.withGlobal(this.window,dijit.getBookmark);if(dojo.isIE){if(dojo.isArray(b)){var tmp=[];dojo.forEach(b,function(n){tmp.push(dijit.range.getIndex(n,this.editNode).o);},this);b=tmp;}}else{var tmp=dijit.range.getIndex(b.startContainer,this.editNode).o;b={startContainer:tmp,startOffset:b.startOffset,endContainer:b.endContainer===b.startContainer?tmp:dijit.range.getIndex(b.endContainer,this.editNode).o,endOffset:b.endOffset};}return b;},_beginEditing:function(cmd){if(this._steps.length===0){this._steps.push({"text":this.savedContent,"bookmark":this._getBookmark()});}},_endEditing:function(_1c){var v=this.getValue(true);this._undoedSteps=[];this._steps.push({"text":v,"bookmark":this._getBookmark()});},onKeyDown:function(e){if(!this.customUndo){this.inherited("onKeyDown",arguments);return;}var k=e.keyCode,ks=dojo.keys;if(e.ctrlKey){if(k===90||k===122){dojo.stopEvent(e);this.undo();return;}else{if(k===89||k===121){dojo.stopEvent(e);this.redo();return;}}}this.inherited("onKeyDown",arguments);switch(k){case ks.ENTER:this.beginEditing();break;case ks.BACKSPACE:case ks.DELETE:this.beginEditing();break;case 88:case 86:if(e.ctrlKey&&!e.altKey&&!e.metaKey){this.endEditing();if(e.keyCode==88){this.beginEditing("cut");setTimeout(dojo.hitch(this,this.endEditing),1);}else{this.beginEditing("paste");setTimeout(dojo.hitch(this,this.endEditing),1);}break;}default:if(!e.ctrlKey&&!e.altKey&&!e.metaKey&&(e.keyCodedojo.keys.F15)){this.beginEditing();break;}case ks.ALT:this.endEditing();break;case ks.UP_ARROW:case ks.DOWN_ARROW:case ks.LEFT_ARROW:case ks.RIGHT_ARROW:case ks.HOME:case ks.END:case ks.PAGE_UP:case ks.PAGE_DOWN:this.endEditing(true);break;case ks.CTRL:case ks.SHIFT:case ks.TAB:break;}},_onBlur:function(){this.inherited("_onBlur",arguments);this.endEditing(true);},onClick:function(){this.endEditing(true);this.inherited("onClick",arguments);}});dojo.subscribe("dijit.Editor.getPlugin",null,function(o){if(o.plugin){return;}var _22=o.args,p;var _p=dijit._editor._Plugin;var _25=_22.name;switch(_25){case "undo":case "redo":case "cut":case "copy":case "paste":case "insertOrderedList":case "insertUnorderedList":case "indent":case "outdent":case "justifyCenter":case "justifyFull":case "justifyLeft":case "justifyRight":case "delete":case "selectAll":case "removeFormat":p=new _p({command:_25});break;case "bold":case "italic":case "underline":case "strikethrough":case "subscript":case "superscript":p=new _p({buttonClass:dijit.form.ToggleButton,command:_25});break;case "|":p=new _p({button:new dijit.ToolbarSeparator()});break;case "createLink":p=new dijit._editor.plugins.LinkDialog({command:_25});break;case "foreColor":case "hiliteColor":p=new dijit._editor.plugins.TextColor({command:_25});break;case "fontName":case "fontSize":case "formatBlock":p=new dijit._editor.plugins.FontChoice({command:_25});}o.plugin=p;});} \ No newline at end of file +if(!dojo._hasResource["dijit.Editor"]){dojo._hasResource["dijit.Editor"]=true;dojo.provide("dijit.Editor");dojo.require("dijit._editor.RichText");dojo.require("dijit.Toolbar");dojo.require("dijit._editor._Plugin");dojo.require("dijit._editor.plugins.EnterKeyHandling");dojo.require("dijit._editor.range");dojo.require("dijit._Container");dojo.require("dojo.i18n");dojo.requireLocalization("dijit._editor","commands",null,"ar,ca,ROOT,cs,da,de,el,es,fi,fr,he,hu,it,ja,ko,nb,nl,pl,pt,pt-pt,ru,sk,sl,sv,th,tr,zh,zh-tw");dojo.declare("dijit.Editor",dijit._editor.RichText,{plugins:null,extraPlugins:null,constructor:function(){if(!dojo.isArray(this.plugins)){this.plugins=["undo","redo","|","cut","copy","paste","|","bold","italic","underline","strikethrough","|","insertOrderedList","insertUnorderedList","indent","outdent","|","justifyLeft","justifyRight","justifyCenter","justifyFull","dijit._editor.plugins.EnterKeyHandling"];}this._plugins=[];this._editInterval=this.editActionInterval*1000;if(dojo.isIE){this.events.push("onBeforeDeactivate");}},postCreate:function(){if(this.customUndo){dojo["require"]("dijit._editor.range");this._steps=this._steps.slice(0);this._undoedSteps=this._undoedSteps.slice(0);}if(dojo.isArray(this.extraPlugins)){this.plugins=this.plugins.concat(this.extraPlugins);}this.inherited(arguments);this.commands=dojo.i18n.getLocalization("dijit._editor","commands",this.lang);if(!this.toolbar){this.toolbar=new dijit.Toolbar({});dojo.place(this.toolbar.domNode,this.editingArea,"before");}dojo.forEach(this.plugins,this.addPlugin,this);this.onNormalizedDisplayChanged();this.toolbar.startup();},destroy:function(){dojo.forEach(this._plugins,function(p){if(p&&p.destroy){p.destroy();}});this._plugins=[];this.toolbar.destroy();delete this.toolbar;this.inherited(arguments);},addPlugin:function(_2,_3){var _4=dojo.isString(_2)?{name:_2}:_2;if(!_4.setEditor){var o={"args":_4,"plugin":null,"editor":this};dojo.publish(dijit._scopeName+".Editor.getPlugin",[o]);if(!o.plugin){var pc=dojo.getObject(_4.name);if(pc){o.plugin=new pc(_4);}}if(!o.plugin){console.warn("Cannot find plugin",_2);return;}_2=o.plugin;}if(arguments.length>1){this._plugins[_3]=_2;}else{this._plugins.push(_2);}_2.setEditor(this);if(dojo.isFunction(_2.setToolbar)){_2.setToolbar(this.toolbar);}},startup:function(){},resize:function(){dijit.layout._LayoutWidget.prototype.resize.apply(this,arguments);},layout:function(){this.editingArea.style.height=(this._contentBox.h-dojo.marginBox(this.toolbar.domNode).h)+"px";if(this.iframe){this.iframe.style.height="100%";}this._layoutMode=true;},onBeforeDeactivate:function(e){if(this.customUndo){this.endEditing(true);}this._saveSelection();},customUndo:dojo.isIE,editActionInterval:3,beginEditing:function(_8){if(!this._inEditing){this._inEditing=true;this._beginEditing(_8);}if(this.editActionInterval>0){if(this._editTimer){clearTimeout(this._editTimer);}this._editTimer=setTimeout(dojo.hitch(this,this.endEditing),this._editInterval);}},_steps:[],_undoedSteps:[],execCommand:function(_9){if(this.customUndo&&(_9=="undo"||_9=="redo")){return this[_9]();}else{if(this.customUndo){this.endEditing();this._beginEditing();}try{var r=this.inherited("execCommand",arguments);if(dojo.isSafari&&_9=="paste"&&!r){var su=dojo.string.substitute,_c=navigator.userAgent.indexOf("Macintosh")!=-1;alert(su(this.commands.pasteShortcutSafari,[su(this.commands[_c?"appleKey":"ctrlKey"],["V"])]));}}catch(e){if(dojo.isMoz&&/copy|cut|paste/.test(_9)){var _d=dojo.string.substitute,_e={cut:"X",copy:"C",paste:"V"},_f=navigator.userAgent.indexOf("Macintosh")!=-1;alert(_d(this.commands.systemShortcutFF,[this.commands[_9],_d(this.commands[_f?"appleKey":"ctrlKey"],[_e[_9]])]));}r=false;}if(this.customUndo){this._endEditing();}return r;}},queryCommandEnabled:function(cmd){if(this.customUndo&&(cmd=="undo"||cmd=="redo")){return cmd=="undo"?(this._steps.length>1):(this._undoedSteps.length>0);}else{return this.inherited("queryCommandEnabled",arguments);}},focus:function(){var _11=0;if(this._savedSelection&&dojo.isIE){_11=dijit._curFocus!=this.editNode;}this.inherited(arguments);if(_11){this._restoreSelection();}},_moveToBookmark:function(b){var _13=b;if(dojo.isIE){if(dojo.isArray(b)){_13=[];dojo.forEach(b,function(n){_13.push(dijit.range.getNode(n,this.editNode));},this);}}else{var r=dijit.range.create();r.setStart(dijit.range.getNode(b.startContainer,this.editNode),b.startOffset);r.setEnd(dijit.range.getNode(b.endContainer,this.editNode),b.endOffset);_13=r;}dojo.withGlobal(this.window,"moveToBookmark",dijit,[_13]);},_changeToStep:function(_16,to){this.setValue(to.text);var b=to.bookmark;if(!b){return;}this._moveToBookmark(b);},undo:function(){this.endEditing(true);var s=this._steps.pop();if(this._steps.length>0){this.focus();this._changeToStep(s,this._steps[this._steps.length-1]);this._undoedSteps.push(s);this.onDisplayChanged();return true;}return false;},redo:function(){this.endEditing(true);var s=this._undoedSteps.pop();if(s&&this._steps.length>0){this.focus();this._changeToStep(this._steps[this._steps.length-1],s);this._steps.push(s);this.onDisplayChanged();return true;}return false;},endEditing:function(_1b){if(this._editTimer){clearTimeout(this._editTimer);}if(this._inEditing){this._endEditing(_1b);this._inEditing=false;}},_getBookmark:function(){var b=dojo.withGlobal(this.window,dijit.getBookmark);var tmp=[];if(dojo.isIE){if(dojo.isArray(b)){dojo.forEach(b,function(n){tmp.push(dijit.range.getIndex(n,this.editNode).o);},this);b=tmp;}}else{tmp=dijit.range.getIndex(b.startContainer,this.editNode).o;b={startContainer:tmp,startOffset:b.startOffset,endContainer:b.endContainer===b.startContainer?tmp:dijit.range.getIndex(b.endContainer,this.editNode).o,endOffset:b.endOffset};}return b;},_beginEditing:function(cmd){if(this._steps.length===0){this._steps.push({"text":this.savedContent,"bookmark":this._getBookmark()});}},_endEditing:function(_20){var v=this.getValue(true);this._undoedSteps=[];this._steps.push({text:v,bookmark:this._getBookmark()});},onKeyDown:function(e){if(!dojo.isIE&&!this.iframe&&e.keyCode==dojo.keys.TAB&&!this.tabIndent){this._saveSelection();}if(!this.customUndo){this.inherited("onKeyDown",arguments);return;}var k=e.keyCode,ks=dojo.keys;if(e.ctrlKey&&!e.altKey){if(k==90||k==122){dojo.stopEvent(e);this.undo();return;}else{if(k==89||k==121){dojo.stopEvent(e);this.redo();return;}}}this.inherited("onKeyDown",arguments);switch(k){case ks.ENTER:case ks.BACKSPACE:case ks.DELETE:this.beginEditing();break;case 88:case 86:if(e.ctrlKey&&!e.altKey&&!e.metaKey){this.endEditing();if(e.keyCode==88){this.beginEditing("cut");setTimeout(dojo.hitch(this,this.endEditing),1);}else{this.beginEditing("paste");setTimeout(dojo.hitch(this,this.endEditing),1);}break;}default:if(!e.ctrlKey&&!e.altKey&&!e.metaKey&&(e.keyCodedojo.keys.F15)){this.beginEditing();break;}case ks.ALT:this.endEditing();break;case ks.UP_ARROW:case ks.DOWN_ARROW:case ks.LEFT_ARROW:case ks.RIGHT_ARROW:case ks.HOME:case ks.END:case ks.PAGE_UP:case ks.PAGE_DOWN:this.endEditing(true);break;case ks.CTRL:case ks.SHIFT:case ks.TAB:break;}},_onBlur:function(){this.inherited("_onBlur",arguments);this.endEditing(true);},_saveSelection:function(){this._savedSelection=this._getBookmark();},_restoreSelection:function(){if(this._savedSelection){this._moveToBookmark(this._savedSelection);delete this._savedSelection;}},_onFocus:function(){this._restoreSelection();this.inherited(arguments);},onClick:function(){this.endEditing(true);this.inherited("onClick",arguments);}});dojo.subscribe(dijit._scopeName+".Editor.getPlugin",null,function(o){if(o.plugin){return;}var _26=o.args,p;var _p=dijit._editor._Plugin;var _29=_26.name;switch(_29){case "undo":case "redo":case "cut":case "copy":case "paste":case "insertOrderedList":case "insertUnorderedList":case "indent":case "outdent":case "justifyCenter":case "justifyFull":case "justifyLeft":case "justifyRight":case "delete":case "selectAll":case "removeFormat":case "unlink":case "insertHorizontalRule":p=new _p({command:_29});break;case "bold":case "italic":case "underline":case "strikethrough":case "subscript":case "superscript":p=new _p({buttonClass:dijit.form.ToggleButton,command:_29});break;case "|":p=new _p({button:new dijit.ToolbarSeparator()});}o.plugin=p;});} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/InlineEditBox.js b/spring-js/src/main/resources/META-INF/dijit/InlineEditBox.js index 35422512..0fd26005 100644 --- a/spring-js/src/main/resources/META-INF/dijit/InlineEditBox.js +++ b/spring-js/src/main/resources/META-INF/dijit/InlineEditBox.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dijit.InlineEditBox"]){dojo._hasResource["dijit.InlineEditBox"]=true;dojo.provide("dijit.InlineEditBox");dojo.require("dojo.i18n");dojo.require("dijit._Widget");dojo.require("dijit._Container");dojo.require("dijit.form.Button");dojo.require("dijit.form.TextBox");dojo.requireLocalization("dijit","common",null,"ROOT,cs,de,es,fr,hu,it,ja,ko,pl,pt,ru,zh,zh-tw");dojo.declare("dijit.InlineEditBox",dijit._Widget,{editing:false,autoSave:true,buttonSave:"",buttonCancel:"",renderAsHtml:false,editor:"dijit.form.TextBox",editorParams:{},onChange:function(_1){},width:"100%",value:"",noValueIndicator:"    ✍    ",postMixInProperties:function(){this.inherited("postMixInProperties",arguments);this.displayNode=this.srcNodeRef;var _2={ondijitclick:"_onClick",onmouseover:"_onMouseOver",onmouseout:"_onMouseOut",onfocus:"_onMouseOver",onblur:"_onMouseOut"};for(var _3 in _2){this.connect(this.displayNode,_3,_2[_3]);}dijit.setWaiRole(this.displayNode,"button");if(!this.displayNode.getAttribute("tabIndex")){this.displayNode.setAttribute("tabIndex",0);}if(!this.value){this.value=this.displayNode.innerHTML;}this._setDisplayValue(this.value);},_onMouseOver:function(){dojo.addClass(this.displayNode,this.disabled?"dijitDisabledClickableRegion":"dijitClickableRegion");},_onMouseOut:function(){dojo.removeClass(this.displayNode,this.disabled?"dijitDisabledClickableRegion":"dijitClickableRegion");},_onClick:function(e){if(this.disabled){return;}if(e){dojo.stopEvent(e);}this._onMouseOut();setTimeout(dojo.hitch(this,"_edit"),0);},_edit:function(){this.editing=true;var _5=(this.renderAsHtml?this.value:this.value.replace(/\s*\r?\n\s*/g,"").replace(//gi,"\n").replace(/>/g,">").replace(/</g,"<").replace(/&/g,"&"));var _6=document.createElement("span");dojo.place(_6,this.domNode,"before");var ew=this.editWidget=new dijit._InlineEditor({value:dojo.trim(_5),autoSave:this.autoSave,buttonSave:this.buttonSave,buttonCancel:this.buttonCancel,renderAsHtml:this.renderAsHtml,editor:this.editor,editorParams:this.editorParams,style:dojo.getComputedStyle(this.displayNode),save:dojo.hitch(this,"save"),cancel:dojo.hitch(this,"cancel"),width:this.width},_6);var _8=ew.domNode.style;this.displayNode.style.display="none";_8.position="static";_8.visibility="visible";this.domNode=ew.domNode;setTimeout(function(){ew.focus();},100);},_showText:function(_9){this.displayNode.style.display="";var _a=this.editWidget.domNode.style;_a.position="absolute";_a.visibility="hidden";this.domNode=this.displayNode;var _b=this;setTimeout(function(){if(_9){dijit.focus(_b.displayNode);}_b.editWidget.destroy();delete _b.editWidget;},100);},save:function(_c){this.editing=false;this.value=this.editWidget.getValue()+"";if(this.renderAsHtml){this.value=this.value.replace(/&/gm,"&").replace(//gm,">").replace(/"/gm,""").replace("\n","
");}this._setDisplayValue(this.value);this.onChange(this.value);this._showText(_c);},_setDisplayValue:function(_d){this.displayNode.innerHTML=_d||this.noValueIndicator;},cancel:function(_e){this.editing=false;this._showText(_e);}});dojo.declare("dijit._InlineEditor",[dijit._Widget,dijit._Templated],{templateString:"
\n",widgetsInTemplate:true,postMixInProperties:function(){this.inherited("postMixInProperties",arguments);this.messages=dojo.i18n.getLocalization("dijit","common",this.lang);dojo.forEach(["buttonSave","buttonCancel"],function(_f){if(!this[_f]){this[_f]=this.messages[_f];}},this);},postCreate:function(){var cls=dojo.getObject(this.editor);var ew=this.editWidget=new cls(this.editorParams,this.editorPlaceholder);var _12=this.style;dojo.forEach(["fontWeight","fontFamily","fontSize","fontStyle"],function(_13){ew.focusNode.style[_13]=_12[_13];},this);dojo.forEach(["marginTop","marginBottom","marginLeft","marginRight"],function(_14){this.domNode.style[_14]=_12[_14];},this);if(this.width=="100%"){ew.domNode.style.width="100%";this.domNode.style.display="block";}else{ew.domNode.style.width=this.width+(Number(this.width)==this.width?"px":"");}this.connect(this.editWidget,"onChange","_onChange");this._ignoreNextOnChange=true;(this.editWidget.setDisplayedValue||this.editWidget.setValue).call(this.editWidget,this.value);this._initialText=this.getValue();if(this.autoSave){this.buttonContainer.style.display="none";}},destroy:function(){this.editWidget.destroy();this.inherited(arguments);},getValue:function(){var ew=this.editWidget;return ew.getDisplayedValue?ew.getDisplayedValue():ew.getValue();},_onKeyPress:function(e){if(this._exitInProgress){return;}if(this.autoSave){if(e.keyCode==dojo.keys.ESCAPE){dojo.stopEvent(e);this._exitInProgress=true;this.cancel(true);}else{if(e.keyCode==dojo.keys.ENTER){dojo.stopEvent(e);this._exitInProgress=true;this.save(true);}}}else{var _17=this;setTimeout(function(){_17.saveButton.setDisabled(_17.getValue()==_17._initialText);},100);}},_onBlur:function(){if(this._exitInProgress){return;}if(this.autoSave){this._exitInProgress=true;if(this.getValue()==this._initialText){this.cancel(false);}else{this.save(false);}}},enableSave:function(){return this.editWidget.isValid?this.editWidget.isValid():true;},_onChange:function(){if(this._ignoreNextOnChange){delete this._ignoreNextOnChange;return;}if(this._exitInProgress){return;}if(this.autoSave){this._exitInProgress=true;this.save(true);}else{this.saveButton.setDisabled((this.getValue()==this._initialText)||!this.enableSave());}},enableSave:function(){return this.editWidget.isValid?this.editWidget.isValid():true;},focus:function(){this.editWidget.focus();dijit.selectInputText(this.editWidget.focusNode);}});dijit.selectInputText=function(_18){var _19=dojo.global;var _1a=dojo.doc;_18=dojo.byId(_18);if(_1a["selection"]&&dojo.body()["createTextRange"]){if(_18.createTextRange){var _1b=_18.createTextRange();_1b.moveStart("character",0);_1b.moveEnd("character",_18.value.length);_1b.select();}}else{if(_19["getSelection"]){var _1c=_19.getSelection();if(_18.setSelectionRange){_18.setSelectionRange(0,_18.value.length);}}}_18.focus();};} \ No newline at end of file +if(!dojo._hasResource["dijit.InlineEditBox"]){dojo._hasResource["dijit.InlineEditBox"]=true;dojo.provide("dijit.InlineEditBox");dojo.require("dojo.i18n");dojo.require("dijit._Widget");dojo.require("dijit._Container");dojo.require("dijit.form.Button");dojo.require("dijit.form.TextBox");dojo.requireLocalization("dijit","common",null,"ar,ca,ROOT,cs,da,de,el,es,fi,fr,he,hu,it,ja,ko,nb,nl,pl,pt,pt-pt,ru,sk,sl,sv,th,tr,zh,zh-tw");dojo.declare("dijit.InlineEditBox",dijit._Widget,{editing:false,autoSave:true,buttonSave:"",buttonCancel:"",renderAsHtml:false,editor:"dijit.form.TextBox",editorParams:{},onChange:function(_1){},onCancel:function(){},width:"100%",value:"",noValueIndicator:"    ✍    ",constructor:function(){this.editorParams={};},postMixInProperties:function(){this.inherited(arguments);this.displayNode=this.srcNodeRef;var _2={ondijitclick:"_onClick",onmouseover:"_onMouseOver",onmouseout:"_onMouseOut",onfocus:"_onMouseOver",onblur:"_onMouseOut"};for(var _3 in _2){this.connect(this.displayNode,_3,_2[_3]);}dijit.setWaiRole(this.displayNode,"button");if(!this.displayNode.getAttribute("tabIndex")){this.displayNode.setAttribute("tabIndex",0);}this.attr("value",this.value||this.displayNode.innerHTML);},setDisabled:function(_4){dojo.deprecated("dijit.InlineEditBox.setDisabled() is deprecated. Use attr('disabled', bool) instead.","","2.0");this.attr("disabled",_4);},_setDisabledAttr:function(_5){this.disabled=_5;dijit.setWaiState(this.domNode,"disabled",_5);},_onMouseOver:function(){dojo.addClass(this.displayNode,this.disabled?"dijitDisabledClickableRegion":"dijitClickableRegion");},_onMouseOut:function(){dojo.removeClass(this.displayNode,this.disabled?"dijitDisabledClickableRegion":"dijitClickableRegion");},_onClick:function(e){if(this.disabled){return;}if(e){dojo.stopEvent(e);}this._onMouseOut();setTimeout(dojo.hitch(this,"edit"),0);},edit:function(){if(this.disabled||this.editing){return;}this.editing=true;var _7=(this.renderAsHtml?this.value:this.value.replace(/\s*\r?\n\s*/g,"").replace(//gi,"\n").replace(/>/g,">").replace(/</g,"<").replace(/&/g,"&").replace(/"/g,"\""));var _8=dojo.doc.createElement("span");dojo.place(_8,this.domNode,"before");var ew=this.editWidget=new dijit._InlineEditor({value:dojo.trim(_7),autoSave:this.autoSave,buttonSave:this.buttonSave,buttonCancel:this.buttonCancel,renderAsHtml:this.renderAsHtml,editor:this.editor,editorParams:this.editorParams,style:dojo.getComputedStyle(this.displayNode),save:dojo.hitch(this,"save"),cancel:dojo.hitch(this,"cancel"),width:this.width},_8);var _a=ew.domNode.style;this.displayNode.style.display="none";_a.position="static";_a.visibility="visible";this.domNode=ew.domNode;setTimeout(function(){if(ew.editWidget._resetValue===undefined){ew.editWidget._resetValue=ew.getValue();}ew.focus();},100);},_showText:function(_b){this.displayNode.style.display="";var ew=this.editWidget;var _d=ew.domNode.style;_d.position="absolute";_d.visibility="hidden";this.domNode=this.displayNode;if(_b){dijit.focus(this.displayNode);}_d.display="none";setTimeout(function(){ew.destroy();delete ew;if(dojo.isIE){dijit.focus(dijit.getFocus());}},1000);},save:function(_e){if(this.disabled||!this.editing){return;}this.editing=false;var _f=this.editWidget.getValue()+"";this.attr("value",this.renderAsHtml?_f:_f.replace(/&/gm,"&").replace(//gm,">").replace(/"/gm,""").replace(/\n/g,"
"));this.onChange(_f);this._showText(_e);},setValue:function(val){dojo.deprecated("dijit.InlineEditBox.setValue() is deprecated. Use attr('value', ...) instead.","","2.0");return this.attr("value",val);},_setValueAttr:function(val){this.value=val;this.displayNode.innerHTML=dojo.trim(val)||this.noValueIndicator;},getValue:function(){dojo.deprecated("dijit.InlineEditBox.getValue() is deprecated. Use attr('value') instead.","","2.0");return this.attr("value");},cancel:function(_12){this.editing=false;this.onCancel();this._showText(_12);}});dojo.declare("dijit._InlineEditor",[dijit._Widget,dijit._Templated],{templateString:" + diff --git a/spring-js/src/main/resources/META-INF/dijit/form/templates/CheckBox.html b/spring-js/src/main/resources/META-INF/dijit/form/templates/CheckBox.html index 5228cc85..580b820f 100644 --- a/spring-js/src/main/resources/META-INF/dijit/form/templates/CheckBox.html +++ b/spring-js/src/main/resources/META-INF/dijit/form/templates/CheckBox.html @@ -1,7 +1,7 @@ -
+/> diff --git a/spring-js/src/main/resources/META-INF/dijit/form/templates/ComboBox.html b/spring-js/src/main/resources/META-INF/dijit/form/templates/ComboBox.html index 72ce7397..a8f28c52 100644 --- a/spring-js/src/main/resources/META-INF/dijit/form/templates/ComboBox.html +++ b/spring-js/src/main/resources/META-INF/dijit/form/templates/ComboBox.html @@ -1,21 +1,19 @@ -
Χ
▼
+ >
 
▼

Χ
diff --git a/spring-js/src/main/resources/META-INF/dijit/form/templates/ComboButton.html b/spring-js/src/main/resources/META-INF/dijit/form/templates/ComboButton.html index dad86633..24cc4278 100644 --- a/spring-js/src/main/resources/META-INF/dijit/form/templates/ComboButton.html +++ b/spring-js/src/main/resources/META-INF/dijit/form/templates/ComboButton.html @@ -1,20 +1,20 @@ - - - -
-
- ${label} -
▼
-
+ >
 
▼
diff --git a/spring-js/src/main/resources/META-INF/dijit/form/templates/DropDownButton.html b/spring-js/src/main/resources/META-INF/dijit/form/templates/DropDownButton.html index ddcf5f12..211b8cd4 100644 --- a/spring-js/src/main/resources/META-INF/dijit/form/templates/DropDownButton.html +++ b/spring-js/src/main/resources/META-INF/dijit/form/templates/DropDownButton.html @@ -1,11 +1,21 @@ -
- -
+ > diff --git a/spring-js/src/main/resources/META-INF/dijit/form/templates/HorizontalSlider.html b/spring-js/src/main/resources/META-INF/dijit/form/templates/HorizontalSlider.html index d78ee919..8d72d3f1 100644 --- a/spring-js/src/main/resources/META-INF/dijit/form/templates/HorizontalSlider.html +++ b/spring-js/src/main/resources/META-INF/dijit/form/templates/HorizontalSlider.html @@ -1,32 +1,32 @@ -
 
▲
 
▲
▼
- + >
 
▼

Χ
diff --git a/spring-js/src/main/resources/META-INF/dijit/form/templates/TextBox.html b/spring-js/src/main/resources/META-INF/dijit/form/templates/TextBox.html index 221f96c2..e8703d36 100644 --- a/spring-js/src/main/resources/META-INF/dijit/form/templates/TextBox.html +++ b/spring-js/src/main/resources/META-INF/dijit/form/templates/TextBox.html @@ -1,4 +1,4 @@ - \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/form/templates/ValidationTextBox.html b/spring-js/src/main/resources/META-INF/dijit/form/templates/ValidationTextBox.html index 8dd25458..83faaa26 100644 --- a/spring-js/src/main/resources/META-INF/dijit/form/templates/ValidationTextBox.html +++ b/spring-js/src/main/resources/META-INF/dijit/form/templates/ValidationTextBox.html @@ -1,13 +1,12 @@ -

Χ
Χ
+ /> diff --git a/spring-js/src/main/resources/META-INF/dijit/form/templates/VerticalSlider.html b/spring-js/src/main/resources/META-INF/dijit/form/templates/VerticalSlider.html index 886a694c..a385b60e 100644 --- a/spring-js/src/main/resources/META-INF/dijit/form/templates/VerticalSlider.html +++ b/spring-js/src/main/resources/META-INF/dijit/form/templates/VerticalSlider.html @@ -1,16 +1,16 @@ -= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dijit.layout.AccordionContainer"]){dojo._hasResource["dijit.layout.AccordionContainer"]=true;dojo.provide("dijit.layout.AccordionContainer");dojo.require("dojo.fx");dojo.require("dijit._Container");dojo.require("dijit._Templated");dojo.require("dijit.layout.StackContainer");dojo.require("dijit.layout.ContentPane");dojo.declare("dijit.layout.AccordionContainer",dijit.layout.StackContainer,{duration:250,_verticalSpace:0,postCreate:function(){this.domNode.style.overflow="hidden";this.inherited("postCreate",arguments);dijit.setWaiRole(this.domNode,"tablist");dojo.addClass(this.domNode,"dijitAccordionContainer");},startup:function(){if(this._started){return;}this.inherited("startup",arguments);if(this.selectedChildWidget){var _1=this.selectedChildWidget.containerNode.style;_1.display="";_1.overflow="auto";this.selectedChildWidget._setSelectedState(true);}},layout:function(){var _2=0;var _3=this.selectedChildWidget;dojo.forEach(this.getChildren(),function(_4){_2+=_4.getTitleHeight();});var _5=this._contentBox;this._verticalSpace=(_5.h-_2);if(_3){_3.containerNode.style.height=this._verticalSpace+"px";}},_setupChild:function(_6){return _6;},_transition:function(_7,_8){if(this._inTransition){return;}this._inTransition=true;var _9=[];var _a=this._verticalSpace;if(_7){_7.setSelected(true);var _b=_7.containerNode;_b.style.display="";_9.push(dojo.animateProperty({node:_b,duration:this.duration,properties:{height:{start:"1",end:_a}},onEnd:function(){_b.style.overflow="auto";}}));}if(_8){_8.setSelected(false);var _c=_8.containerNode;_c.style.overflow="hidden";_9.push(dojo.animateProperty({node:_c,duration:this.duration,properties:{height:{start:_a,end:"1"}},onEnd:function(){_c.style.display="none";}}));}this._inTransition=false;dojo.fx.combine(_9).play();},_onKeyPress:function(e){if(this.disabled||e.altKey){return;}var k=dojo.keys;switch(e.keyCode){case k.LEFT_ARROW:case k.UP_ARROW:case k.PAGE_UP:this._adjacent(false)._onTitleClick();dojo.stopEvent(e);break;case k.RIGHT_ARROW:case k.DOWN_ARROW:case k.PAGE_DOWN:this._adjacent(true)._onTitleClick();dojo.stopEvent(e);break;default:if(e.ctrlKey&&e.keyCode==k.TAB){this._adjacent(e._dijitWidget,!e.shiftKey)._onTitleClick();dojo.stopEvent(e);}}}});dojo.declare("dijit.layout.AccordionPane",[dijit.layout.ContentPane,dijit._Templated,dijit._Contained],{templateString:"
▲
▼
${title}
\n
\n",postCreate:function(){this.inherited("postCreate",arguments);dojo.setSelectable(this.titleNode,false);this.setSelected(this.selected);},getTitleHeight:function(){return dojo.marginBox(this.titleNode).h;},_onTitleClick:function(){var _f=this.getParent();if(!_f._inTransition){_f.selectChild(this);dijit.focus(this.focusNode);}},_onTitleKeyPress:function(evt){evt._dijitWidget=this;return this.getParent()._onKeyPress(evt);},_setSelectedState:function(_11){this.selected=_11;dojo[(_11?"addClass":"removeClass")](this.domNode,"dijitAccordionPane-selected");this.focusNode.setAttribute("tabIndex",_11?"0":"-1");},_handleFocus:function(e){dojo[(e.type=="focus"?"addClass":"removeClass")](this.focusNode,"dijitAccordionPaneFocused");},setSelected:function(_13){this._setSelectedState(_13);if(_13){this.onSelected();}},onSelected:function(){}});} \ No newline at end of file +if(!dojo._hasResource["dijit.layout.AccordionContainer"]){dojo._hasResource["dijit.layout.AccordionContainer"]=true;dojo.provide("dijit.layout.AccordionContainer");dojo.require("dojo.fx");dojo.require("dijit._Container");dojo.require("dijit._Templated");dojo.require("dijit.layout.StackContainer");dojo.require("dijit.layout.ContentPane");dojo.declare("dijit.layout.AccordionContainer",dijit.layout.StackContainer,{duration:dijit.defaultDuration,_verticalSpace:0,baseClass:"dijitAccordionContainer",postCreate:function(){this.domNode.style.overflow="hidden";this.inherited(arguments);dijit.setWaiRole(this.domNode,"tablist");},startup:function(){if(this._started){return;}this.inherited(arguments);if(this.selectedChildWidget){var _1=this.selectedChildWidget.containerNode.style;_1.display="";_1.overflow="auto";this.selectedChildWidget._setSelectedState(true);}},_getTargetHeight:function(_2){var cs=dojo.getComputedStyle(_2);return Math.max(this._verticalSpace-dojo._getPadBorderExtents(_2,cs).h,0);},layout:function(){var _4=0;var _5=this.selectedChildWidget;dojo.forEach(this.getChildren(),function(_6){_4+=_6.getTitleHeight();});var _7=this._contentBox;this._verticalSpace=_7.h-_4;if(_5){_5.containerNode.style.height=this._getTargetHeight(_5.containerNode)+"px";}},_setupChild:function(_8){return _8;},_transition:function(_9,_a){if(this._inTransition){return;}this._inTransition=true;var _b=[];var _c=this._verticalSpace;if(_9){_9.setSelected(true);var _d=_9.containerNode;_d.style.display="";_c=this._getTargetHeight(_9.containerNode);_b.push(dojo.animateProperty({node:_d,duration:this.duration,properties:{height:{start:1,end:_c}},onEnd:function(){_d.style.overflow="auto";}}));}if(_a){_a.setSelected(false);var _e=_a.containerNode;_e.style.overflow="hidden";_c=this._getTargetHeight(_a.containerNode);_b.push(dojo.animateProperty({node:_e,duration:this.duration,properties:{height:{start:_c,end:"1"}},onEnd:function(){_e.style.display="none";}}));}this._inTransition=false;dojo.fx.combine(_b).play();},_onKeyPress:function(e){if(this.disabled||e.altKey||!(e._dijitWidget||e.ctrlKey)){return;}var k=dojo.keys;var _11=e._dijitWidget;switch(e.charOrCode){case k.LEFT_ARROW:case k.UP_ARROW:if(_11){this._adjacent(false)._onTitleClick();dojo.stopEvent(e);}break;case k.PAGE_UP:if(e.ctrlKey){this._adjacent(false)._onTitleClick();dojo.stopEvent(e);}break;case k.RIGHT_ARROW:case k.DOWN_ARROW:if(_11){this._adjacent(true)._onTitleClick();dojo.stopEvent(e);}break;case k.PAGE_DOWN:if(e.ctrlKey){this._adjacent(true)._onTitleClick();dojo.stopEvent(e);}break;default:if(e.ctrlKey&&e.charOrCode===k.TAB){this._adjacent(e._dijitWidget,!e.shiftKey)._onTitleClick();dojo.stopEvent(e);}}}});dojo.declare("dijit.layout.AccordionPane",[dijit.layout.ContentPane,dijit._Templated,dijit._Contained],{templateString:"
+-
\n
\n",attributeMap:dojo.mixin(dojo.clone(dijit.layout.ContentPane.prototype.attributeMap),{title:{node:"titleTextNode",type:"innerHTML"}}),baseClass:"dijitAccordionPane",postCreate:function(){this.inherited(arguments);dojo.setSelectable(this.titleNode,false);this.setSelected(this.selected);dojo.attr(this.titleTextNode,"id",this.domNode.id+"_title");dijit.setWaiState(this.focusNode,"labelledby",dojo.attr(this.titleTextNode,"id"));},getTitleHeight:function(){return dojo.marginBox(this.titleNode).h;},_onTitleClick:function(){var _12=this.getParent();if(!_12._inTransition){_12.selectChild(this);dijit.focus(this.focusNode);}},_onTitleEnter:function(){dojo.addClass(this.focusNode,"dijitAccordionTitle-hover");},_onTitleLeave:function(){dojo.removeClass(this.focusNode,"dijitAccordionTitle-hover");},_onTitleKeyPress:function(evt){evt._dijitWidget=this;return this.getParent()._onKeyPress(evt);},_setSelectedState:function(_14){this.selected=_14;dojo[(_14?"addClass":"removeClass")](this.titleNode,"dijitAccordionTitle-selected");dijit.setWaiState(this.focusNode,"expanded",_14);this.focusNode.setAttribute("tabIndex",_14?"0":"-1");},_handleFocus:function(e){dojo[(e.type=="focus"?"addClass":"removeClass")](this.focusNode,"dijitAccordionFocused");},setSelected:function(_16){this._setSelectedState(_16);if(_16){this.onSelected();this._loadCheck();}},onSelected:function(){}});} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/layout/BorderContainer.js b/spring-js/src/main/resources/META-INF/dijit/layout/BorderContainer.js index 3218c041..a97a8b9a 100644 --- a/spring-js/src/main/resources/META-INF/dijit/layout/BorderContainer.js +++ b/spring-js/src/main/resources/META-INF/dijit/layout/BorderContainer.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2008, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dijit.layout.BorderContainer"]){dojo._hasResource["dijit.layout.BorderContainer"]=true;dojo.provide("dijit.layout.BorderContainer");dojo.require("dijit.layout._LayoutWidget");dojo.require("dojo.cookie");dojo.declare("dijit.layout.BorderContainer",dijit.layout._LayoutWidget,{design:"headline",liveSplitters:true,persist:false,_splitterClass:"dijit.layout._Splitter",postCreate:function(){this.inherited(arguments);this._splitters={};this._splitterThickness={};dojo.addClass(this.domNode,"dijitBorderContainer");},startup:function(){if(this._started){return;}dojo.forEach(this.getChildren(),this._setupChild,this);this.inherited(arguments);},_setupChild:function(_1){var _2=_1.region;if(_2){_1.domNode.style.position="absolute";var _3=this.isLeftToRight();if(_2=="leading"){_2=_3?"left":"right";}if(_2=="trailing"){_2=_3?"right":"left";}this["_"+_2]=_1.domNode;this["_"+_2+"Widget"]=_1;if(_1.splitter){var _4=dojo.getObject(this._splitterClass);var _5={left:"right",right:"left",top:"bottom",bottom:"top",leading:"trailing",trailing:"leading"};var _6=dojo.query("[region="+_5[_1.region]+"]",this.domNode);var _7=new _4({container:this,child:_1,region:_2,oppNode:_6[0],live:this.liveSplitters});this._splitters[_2]=_7.domNode;dojo.place(_7.domNode,_1.domNode,"after");this._computeSplitterThickness(_2);}_1.region=_2;}},_computeSplitterThickness:function(_8){var re=new RegExp("top|bottom");this._splitterThickness[_8]=dojo.marginBox(this._splitters[_8])[(re.test(_8)?"h":"w")];},layout:function(){this._layoutChildren();},addChild:function(_a,_b){this.inherited(arguments);this._setupChild(_a);if(this._started){this._layoutChildren();}},removeChild:function(_c){var _d=_c.region;var _e=this._splitters[_d];if(_e){dijit.byNode(_e).destroy();delete this._splitters[_d];delete this._splitterThickness[_d];}this.inherited(arguments);delete this["_"+_d];delete this["_"+_d+"Widget"];if(this._started){this._layoutChildren(_c.region);}},_layoutChildren:function(_f){var _10=(this.design=="sidebar");var _11=0,_12=0,_13=0,_14=0;var _15={},_16={},_17={},_18={},_19=(this._center&&this._center.style)||{};var _1a=/left|right/.test(_f);var _1b=!_f||(!_1a&&!_10);var _1c=!_f||(_1a&&_10);if(this._top){_15=_1c&&this._top.style;_11=dojo.marginBox(this._top).h;}if(this._left){_16=_1b&&this._left.style;_13=dojo.marginBox(this._left).w;}if(this._right){_17=_1b&&this._right.style;_14=dojo.marginBox(this._right).w;}if(this._bottom){_18=_1c&&this._bottom.style;_12=dojo.marginBox(this._bottom).h;}var _1d=this._splitters;var _1e=_1d.top;var _1f=_1d.bottom;var _20=_1d.left;var _21=_1d.right;var _22=this._splitterThickness;var _23=_22.top||0;var _24=_22.left||0;var _25=_22.right||0;var _26=_22.bottom||0;if(_24>50||_25>50){setTimeout(dojo.hitch(this,function(){for(var _27 in this._splitters){this._computeSplitterThickness(_27);}this._layoutChildren();}),50);return false;}var _28={left:(_10?_13+_24:"0")+"px",right:(_10?_14+_25:"0")+"px"};if(_1e){dojo.mixin(_1e.style,_28);_1e.style.top=_11+"px";}if(_1f){dojo.mixin(_1f.style,_28);_1f.style.bottom=_12+"px";}_28={top:(_10?"0":_11+_23)+"px",bottom:(_10?"0":_12+_26)+"px"};if(_20){dojo.mixin(_20.style,_28);_20.style.left=_13+"px";}if(_21){dojo.mixin(_21.style,_28);_21.style.right=_14+"px";}dojo.mixin(_19,{top:_11+_23+"px",left:_13+_24+"px",right:_14+_25+"px",bottom:_12+_26+"px"});var _29={top:_10?"0":_19.top,bottom:_10?"0":_19.bottom};dojo.mixin(_16,_29);dojo.mixin(_17,_29);_16.left=_17.right=_15.top=_18.bottom="0";if(_10){_15.left=_18.left=_13+(this.isLeftToRight()?_24:0)+"px";_15.right=_18.right=_14+(this.isLeftToRight()?0:_25)+"px";}else{_15.left=_15.right=_18.left=_18.right="0";}var _2a=dojo.isIE||dojo.some(this.getChildren(),function(_2b){return _2b.domNode.tagName=="TEXTAREA";});if(_2a){var _2c=function(n,b){n=dojo.byId(n);var s=dojo.getComputedStyle(n);if(!b){return dojo._getBorderBox(n,s);}var me=dojo._getMarginExtents(n,s);dojo._setMarginBox(n,b.l,b.t,b.w+me.w,b.h+me.h,s);return null;};var _31=function(_32,dim){if(_32){_32.resize?_32.resize(dim):dojo.marginBox(_32.domNode,dim);}};var _34=_2c(this.domNode);var _35=_34.h;var _36=_35;if(this._top){_36-=_11;}if(this._bottom){_36-=_12;}if(_1e){_36-=_23;}if(_1f){_36-=_26;}var _37={h:_36};var _38=_10?_35:_36;if(_20){_20.style.height=_38;}if(_21){_21.style.height=_38;}_31(this._leftWidget,{h:_38});_31(this._rightWidget,{h:_38});var _39=_34.w;var _3a=_39;if(this._left){_3a-=_13;}if(this._right){_3a-=_14;}if(_20){_3a-=_24;}if(_21){_3a-=_25;}_37.w=_3a;var _3b=_10?_3a:_39;if(_1e){_1e.style.width=_3b;}if(_1f){_1f.style.width=_3b;}_31(this._topWidget,{w:_3b});_31(this._bottomWidget,{w:_3b});_31(this._centerWidget,_37);}else{var _3c={};if(_f){_3c[_f]=_3c.center=true;if(/top|bottom/.test(_f)&&this.design!="sidebar"){_3c.left=_3c.right=true;}else{if(/left|right/.test(_f)&&this.design=="sidebar"){_3c.top=_3c.bottom=true;}}}dojo.forEach(this.getChildren(),function(_3d){if(_3d.resize&&(!_f||_3d.region in _3c)){_3d.resize();}},this);}}});dojo.extend(dijit._Widget,{region:"",splitter:false,minSize:0,maxSize:Infinity});dojo.require("dijit._Templated");dojo.declare("dijit.layout._Splitter",[dijit._Widget,dijit._Templated],{live:true,templateString:"
",postCreate:function(){this.inherited(arguments);this.horizontal=/top|bottom/.test(this.region);dojo.addClass(this.domNode,"dijitSplitter"+(this.horizontal?"H":"V"));this._factor=/top|left/.test(this.region)?1:-1;this._minSize=this.child.minSize;this._computeMaxSize();this.connect(this.container,"layout",dojo.hitch(this,this._computeMaxSize));this._cookieName=this.container.id+"_"+this.region;if(this.container.persist){var _3e=dojo.cookie(this._cookieName);if(_3e){this.child.domNode.style[this.horizontal?"height":"width"]=_3e;}}},_computeMaxSize:function(){var dim=this.horizontal?"h":"w";var _40=dojo.contentBox(this.container.domNode)[dim]-(this.oppNode?dojo.marginBox(this.oppNode)[dim]:0);this._maxSize=Math.min(this.child.maxSize,_40);},_startDrag:function(e){if(!this.cover){this.cover=dojo.doc.createElement("div");dojo.addClass(this.cover,"dijitSplitterCover");dojo.place(this.cover,this.child.domNode,"after");}else{this.cover.style.zIndex=1;}if(this.fake){dojo._destroyElement(this.fake);}if(!(this._resize=this.live)){(this.fake=this.domNode.cloneNode(true)).removeAttribute("id");dojo.addClass(this.domNode,"dijitSplitterShadow");dojo.place(this.fake,this.domNode,"after");}dojo.addClass(this.domNode,"dijitSplitterActive");var _42=this._factor,max=this._maxSize,min=this._minSize||10;var _45=this.horizontal?"pageY":"pageX";var _46=e[_45];var _47=this.domNode.style;var dim=this.horizontal?"h":"w";var _49=dojo.marginBox(this.child.domNode)[dim];var _4a=parseInt(this.domNode.style[this.region]);var _4b=this._resize;var _4c=this.region;var mb={};var _4e=this.child.domNode;var _4f=dojo.hitch(this.container,this.container._layoutChildren);var de=dojo.doc.body;this._handlers=(this._handlers||[]).concat([dojo.connect(de,"onmousemove",this._drag=function(e,_52){var _53=e[_45]-_46,_54=_42*_53+_49,_55=Math.max(Math.min(_54,max),min);if(_4b||_52){mb[dim]=_55;dojo.marginBox(_4e,mb);_4f(_4c);}_47[_4c]=_42*_53+_4a+(_55-_54)+"px";}),dojo.connect(de,"onmouseup",this,"_stopDrag")]);dojo.stopEvent(e);},_stopDrag:function(e){try{if(this.cover){this.cover.style.zIndex=-1;}if(this.fake){dojo._destroyElement(this.fake);}dojo.removeClass(this.domNode,"dijitSplitterActive");dojo.removeClass(this.domNode,"dijitSplitterShadow");this._drag(e);this._drag(e,true);}finally{this._cleanupHandlers();delete this._drag;}if(this.container.persist){dojo.cookie(this._cookieName,this.child.domNode.style[this.horizontal?"height":"width"]);}},_cleanupHandlers:function(){dojo.forEach(this._handlers,dojo.disconnect);delete this._handlers;},_onKeyPress:function(e){this._resize=true;var _58=this.horizontal;var _59=1;var dk=dojo.keys;switch(e.keyCode){case _58?dk.UP_ARROW:dk.LEFT_ARROW:_59*=-1;break;case _58?dk.DOWN_ARROW:dk.RIGHT_ARROW:break;default:return;}var _5b=dojo.marginBox(this.child.domNode)[_58?"h":"w"]+this._factor*_59;var mb={};mb[this.horizontal?"h":"w"]=Math.max(Math.min(_5b,this._maxSize),this._minSize);dojo.marginBox(this.child.domNode,mb);this.container._layoutChildren(this.region);dojo.stopEvent(e);},destroy:function(){this._cleanupHandlers();delete this.child;delete this.container;delete this.fake;this.inherited(arguments);}});} \ No newline at end of file +if(!dojo._hasResource["dijit.layout.BorderContainer"]){dojo._hasResource["dijit.layout.BorderContainer"]=true;dojo.provide("dijit.layout.BorderContainer");dojo.require("dijit.layout._LayoutWidget");dojo.require("dojo.cookie");dojo.declare("dijit.layout.BorderContainer",dijit.layout._LayoutWidget,{design:"headline",gutters:true,liveSplitters:true,persist:false,baseClass:"dijitBorderContainer",_splitterClass:"dijit.layout._Splitter",postMixInProperties:function(){if(!this.gutters){this.baseClass+="NoGutter";}this.inherited(arguments);},postCreate:function(){this.inherited(arguments);this._splitters={};this._splitterThickness={};},startup:function(){if(this._started){return;}dojo.forEach(this.getChildren(),this._setupChild,this);this.inherited(arguments);},_setupChild:function(_1){var _2=_1.region;if(_2){this.inherited(arguments);dojo.addClass(_1.domNode,this.baseClass+"Pane");var _3=this.isLeftToRight();if(_2=="leading"){_2=_3?"left":"right";}if(_2=="trailing"){_2=_3?"right":"left";}this["_"+_2]=_1.domNode;this["_"+_2+"Widget"]=_1;if((_1.splitter||this.gutters)&&!this._splitters[_2]){var _4=dojo.getObject(_1.splitter?this._splitterClass:"dijit.layout._Gutter");var _5={left:"right",right:"left",top:"bottom",bottom:"top",leading:"trailing",trailing:"leading"};var _6=new _4({container:this,child:_1,region:_2,oppNode:dojo.query("[region="+_5[_1.region]+"]",this.domNode)[0],live:this.liveSplitters});_6.isSplitter=true;this._splitters[_2]=_6.domNode;dojo.place(this._splitters[_2],_1.domNode,"after");_6.startup();}_1.region=_2;}},_computeSplitterThickness:function(_7){this._splitterThickness[_7]=this._splitterThickness[_7]||dojo.marginBox(this._splitters[_7])[(/top|bottom/.test(_7)?"h":"w")];},layout:function(){for(var _8 in this._splitters){this._computeSplitterThickness(_8);}this._layoutChildren();},addChild:function(_9,_a){this.inherited(arguments);if(this._started){this._layoutChildren();}},removeChild:function(_b){var _c=_b.region;var _d=this._splitters[_c];if(_d){dijit.byNode(_d).destroy();delete this._splitters[_c];delete this._splitterThickness[_c];}this.inherited(arguments);delete this["_"+_c];delete this["_"+_c+"Widget"];if(this._started){this._layoutChildren(_b.region);}dojo.removeClass(_b.domNode,this.baseClass+"Pane");},getChildren:function(){return dojo.filter(this.inherited(arguments),function(_e){return !_e.isSplitter;});},getSplitter:function(_f){var _10=this._splitters[_f];return _10?dijit.byNode(_10):null;},resize:function(_11,_12){if(!this.cs||!this.pe){var _13=this.domNode;this.cs=dojo.getComputedStyle(_13);this.pe=dojo._getPadExtents(_13,this.cs);this.pe.r=dojo._toPixelValue(_13,this.cs.paddingRight);this.pe.b=dojo._toPixelValue(_13,this.cs.paddingBottom);dojo.style(_13,"padding","0px");}this.inherited(arguments);},_layoutChildren:function(_14){var _15=(this.design=="sidebar");var _16=0,_17=0,_18=0,_19=0;var _1a={},_1b={},_1c={},_1d={},_1e=(this._center&&this._center.style)||{};var _1f=/left|right/.test(_14);var _20=!_14||(!_1f&&!_15);var _21=!_14||(_1f&&_15);if(this._top){_1a=_21&&this._top.style;_16=dojo.marginBox(this._top).h;}if(this._left){_1b=_20&&this._left.style;_18=dojo.marginBox(this._left).w;}if(this._right){_1c=_20&&this._right.style;_19=dojo.marginBox(this._right).w;}if(this._bottom){_1d=_21&&this._bottom.style;_17=dojo.marginBox(this._bottom).h;}var _22=this._splitters;var _23=_22.top,_24=_22.bottom,_25=_22.left,_26=_22.right;var _27=this._splitterThickness;var _28=_27.top||0,_29=_27.left||0,_2a=_27.right||0,_2b=_27.bottom||0;if(_29>50||_2a>50){setTimeout(dojo.hitch(this,function(){this._splitterThickness={};for(var _2c in this._splitters){this._computeSplitterThickness(_2c);}this._layoutChildren();}),50);return false;}var pe=this.pe;var _2e={left:(_15?_18+_29:0)+pe.l+"px",right:(_15?_19+_2a:0)+pe.r+"px"};if(_23){dojo.mixin(_23.style,_2e);_23.style.top=_16+pe.t+"px";}if(_24){dojo.mixin(_24.style,_2e);_24.style.bottom=_17+pe.b+"px";}_2e={top:(_15?0:_16+_28)+pe.t+"px",bottom:(_15?0:_17+_2b)+pe.b+"px"};if(_25){dojo.mixin(_25.style,_2e);_25.style.left=_18+pe.l+"px";}if(_26){dojo.mixin(_26.style,_2e);_26.style.right=_19+pe.r+"px";}dojo.mixin(_1e,{top:pe.t+_16+_28+"px",left:pe.l+_18+_29+"px",right:pe.r+_19+_2a+"px",bottom:pe.b+_17+_2b+"px"});var _2f={top:_15?pe.t+"px":_1e.top,bottom:_15?pe.b+"px":_1e.bottom};dojo.mixin(_1b,_2f);dojo.mixin(_1c,_2f);_1b.left=pe.l+"px";_1c.right=pe.r+"px";_1a.top=pe.t+"px";_1d.bottom=pe.b+"px";if(_15){_1a.left=_1d.left=_18+_29+pe.l+"px";_1a.right=_1d.right=_19+_2a+pe.r+"px";}else{_1a.left=_1d.left=pe.l+"px";_1a.right=_1d.right=pe.r+"px";}var _30=this._borderBox.h-pe.t-pe.b,_31=_30-(_16+_28+_17+_2b),_32=_15?_30:_31;var _33=this._borderBox.w-pe.l-pe.r,_34=_33-(_18+_29+_19+_2a),_35=_15?_34:_33;var dim={top:{w:_35,h:_16},bottom:{w:_35,h:_17},left:{w:_18,h:_32},right:{w:_19,h:_32},center:{h:_31,w:_34}};var _37=dojo.isIE||dojo.some(this.getChildren(),function(_38){return _38.domNode.tagName=="TEXTAREA"||_38.domNode.tagName=="INPUT";});if(_37){var _39=function(_3a,_3b,_3c){if(_3a){(_3a.resize?_3a.resize(_3b,_3c):dojo.marginBox(_3a.domNode,_3b));}};if(_25){_25.style.height=_32;}if(_26){_26.style.height=_32;}_39(this._leftWidget,{h:_32},dim.left);_39(this._rightWidget,{h:_32},dim.right);if(_23){_23.style.width=_35;}if(_24){_24.style.width=_35;}_39(this._topWidget,{w:_35},dim.top);_39(this._bottomWidget,{w:_35},dim.bottom);_39(this._centerWidget,dim.center);}else{var _3d={};if(_14){_3d[_14]=_3d.center=true;if(/top|bottom/.test(_14)&&this.design!="sidebar"){_3d.left=_3d.right=true;}else{if(/left|right/.test(_14)&&this.design=="sidebar"){_3d.top=_3d.bottom=true;}}}dojo.forEach(this.getChildren(),function(_3e){if(_3e.resize&&(!_14||_3e.region in _3d)){_3e.resize(null,dim[_3e.region]);}},this);}},destroy:function(){for(region in this._splitters){var _3f=this._splitters[region];dijit.byNode(_3f).destroy();dojo._destroyElement(_3f);}delete this._splitters;delete this._splitterThickness;this.inherited(arguments);}});dojo.extend(dijit._Widget,{region:"",splitter:false,minSize:0,maxSize:Infinity});dojo.require("dijit._Templated");dojo.declare("dijit.layout._Splitter",[dijit._Widget,dijit._Templated],{live:true,templateString:"
",postCreate:function(){this.inherited(arguments);this.horizontal=/top|bottom/.test(this.region);dojo.addClass(this.domNode,"dijitSplitter"+(this.horizontal?"H":"V"));this._factor=/top|left/.test(this.region)?1:-1;this._minSize=this.child.minSize;this.child.domNode._recalc=true;this.connect(this.container,"resize",function(){this.child.domNode._recalc=true;});this._cookieName=this.container.id+"_"+this.region;if(this.container.persist){var _40=dojo.cookie(this._cookieName);if(_40){this.child.domNode.style[this.horizontal?"height":"width"]=_40;}}},_computeMaxSize:function(){var dim=this.horizontal?"h":"w",_42=this.container._splitterThickness[this.region];var _43=dojo.contentBox(this.container.domNode)[dim]-(this.oppNode?dojo.marginBox(this.oppNode)[dim]:0)-20-_42*2;this._maxSize=Math.min(this.child.maxSize,_43);},_startDrag:function(e){if(this.child.domNode._recalc){this._computeMaxSize();this.child.domNode._recalc=false;}if(!this.cover){this.cover=dojo.doc.createElement("div");dojo.addClass(this.cover,"dijitSplitterCover");dojo.place(this.cover,this.child.domNode,"after");}else{this.cover.style.zIndex=1;}if(this.fake){dojo._destroyElement(this.fake);}if(!(this._resize=this.live)){(this.fake=this.domNode.cloneNode(true)).removeAttribute("id");dojo.addClass(this.domNode,"dijitSplitterShadow");dojo.place(this.fake,this.domNode,"after");}dojo.addClass(this.domNode,"dijitSplitterActive");var _45=this._factor,max=this._maxSize,min=this._minSize||20,_48=this.horizontal,_49=_48?"pageY":"pageX",_4a=e[_49],_4b=this.domNode.style,dim=_48?"h":"w",_4d=dojo.marginBox(this.child.domNode)[dim],_4e=this.region,_4f=parseInt(this.domNode.style[_4e],10),_50=this._resize,mb={},_52=this.child.domNode,_53=dojo.hitch(this.container,this.container._layoutChildren),de=dojo.doc.body;this._handlers=(this._handlers||[]).concat([dojo.connect(de,"onmousemove",this._drag=function(e,_56){var _57=e[_49]-_4a,_58=_45*_57+_4d,_59=Math.max(Math.min(_58,max),min);if(_50||_56){mb[dim]=_59;dojo.marginBox(_52,mb);_53(_4e);}_4b[_4e]=_45*_57+_4f+(_59-_58)+"px";}),dojo.connect(de,"onmouseup",this,"_stopDrag")]);dojo.stopEvent(e);},_stopDrag:function(e){try{if(this.cover){this.cover.style.zIndex=-1;}if(this.fake){dojo._destroyElement(this.fake);}dojo.removeClass(this.domNode,"dijitSplitterActive");dojo.removeClass(this.domNode,"dijitSplitterShadow");this._drag(e);this._drag(e,true);}finally{this._cleanupHandlers();if(this.oppNode){this.oppNode._recalc=true;}delete this._drag;}if(this.container.persist){dojo.cookie(this._cookieName,this.child.domNode.style[this.horizontal?"height":"width"],{expires:365});}},_cleanupHandlers:function(){dojo.forEach(this._handlers,dojo.disconnect);delete this._handlers;},_onKeyPress:function(e){if(this.child.domNode._recalc){this._computeMaxSize();this.child.domNode._recalc=false;}this._resize=true;var _5c=this.horizontal;var _5d=1;var dk=dojo.keys;switch(e.charOrCode){case _5c?dk.UP_ARROW:dk.LEFT_ARROW:_5d*=-1;case _5c?dk.DOWN_ARROW:dk.RIGHT_ARROW:break;default:return;}var _5f=dojo.marginBox(this.child.domNode)[_5c?"h":"w"]+this._factor*_5d;var mb={};mb[this.horizontal?"h":"w"]=Math.max(Math.min(_5f,this._maxSize),this._minSize);dojo.marginBox(this.child.domNode,mb);if(this.oppNode){this.oppNode._recalc=true;}this.container._layoutChildren(this.region);dojo.stopEvent(e);},destroy:function(){this._cleanupHandlers();delete this.child;delete this.container;delete this.fake;this.inherited(arguments);}});dojo.declare("dijit.layout._Gutter",[dijit._Widget,dijit._Templated],{templateString:"
",postCreate:function(){this.horizontal=/top|bottom/.test(this.region);dojo.addClass(this.domNode,"dijitGutter"+(this.horizontal?"H":"V"));}});} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/layout/ContentPane.js b/spring-js/src/main/resources/META-INF/dijit/layout/ContentPane.js index 4adc3ee6..9e4394e4 100644 --- a/spring-js/src/main/resources/META-INF/dijit/layout/ContentPane.js +++ b/spring-js/src/main/resources/META-INF/dijit/layout/ContentPane.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dijit.layout.ContentPane"]){dojo._hasResource["dijit.layout.ContentPane"]=true;dojo.provide("dijit.layout.ContentPane");dojo.require("dijit._Widget");dojo.require("dijit.layout._LayoutWidget");dojo.require("dojo.parser");dojo.require("dojo.string");dojo.requireLocalization("dijit","loading",null,"cs,de,es,fr,hu,it,ja,ko,ROOT,pl,pt,ru,zh,zh-tw");dojo.declare("dijit.layout.ContentPane",dijit._Widget,{href:"",extractContent:false,parseOnLoad:true,preventCache:false,preload:false,refreshOnShow:false,loadingMessage:"${loadingState}",errorMessage:"${errorState}",isLoaded:false,"class":"dijitContentPane",postCreate:function(){this.domNode.title="";if(this.preload){this._loadCheck();}var _1=dojo.i18n.getLocalization("dijit","loading",this.lang);this.loadingMessage=dojo.string.substitute(this.loadingMessage,_1);this.errorMessage=dojo.string.substitute(this.errorMessage,_1);dojo.addClass(this.domNode,this["class"]);},startup:function(){if(this._started){return;}this._checkIfSingleChild();if(this._singleChild){this._singleChild.startup();}this._loadCheck();this._started=true;},_checkIfSingleChild:function(){var _2=dojo.query(">",this.containerNode||this.domNode),_3=_2.filter("[widgetId]");if(_2.length==1&&_3.length==1){this.isContainer=true;this._singleChild=dijit.byNode(_3[0]);}else{delete this.isContainer;delete this._singleChild;}},refresh:function(){return this._prepareLoad(true);},setHref:function(_4){this.href=_4;return this._prepareLoad();},setContent:function(_5){if(!this._isDownloaded){this.href="";this._onUnloadHandler();}this._setContent(_5||"");this._isDownloaded=false;if(this.parseOnLoad){this._createSubWidgets();}this._checkIfSingleChild();if(this._singleChild&&this._singleChild.resize){this._singleChild.resize(this._contentBox);}this._onLoadHandler();},cancel:function(){if(this._xhrDfd&&(this._xhrDfd.fired==-1)){this._xhrDfd.cancel();}delete this._xhrDfd;},destroy:function(){if(this._beingDestroyed){return;}this._onUnloadHandler();this._beingDestroyed=true;this.inherited("destroy",arguments);},resize:function(_6){dojo.marginBox(this.domNode,_6);var _7=this.containerNode||this.domNode,mb=dojo.mixin(dojo.marginBox(_7),_6||{});this._contentBox=dijit.layout.marginBox2contentBox(_7,mb);if(this._singleChild&&this._singleChild.resize){this._singleChild.resize(this._contentBox);}},_prepareLoad:function(_9){this.cancel();this.isLoaded=false;this._loadCheck(_9);},_loadCheck:function(_a){var _b=((this.open!==false)&&(this.domNode.style.display!="none"));if(this.href&&(_a||(this.preload&&!this._xhrDfd)||(this.refreshOnShow&&_b&&!this._xhrDfd)||(!this.isLoaded&&_b&&!this._xhrDfd))){this._downloadExternalContent();}},_downloadExternalContent:function(){this._onUnloadHandler();this._setContent(this.onDownloadStart.call(this));var _c=this;var _d={preventCache:(this.preventCache||this.refreshOnShow),url:this.href,handleAs:"text"};if(dojo.isObject(this.ioArgs)){dojo.mixin(_d,this.ioArgs);}var _e=this._xhrDfd=(this.ioMethod||dojo.xhrGet)(_d);_e.addCallback(function(_f){try{_c.onDownloadEnd.call(_c);_c._isDownloaded=true;_c.setContent.call(_c,_f);}catch(err){_c._onError.call(_c,"Content",err);}delete _c._xhrDfd;return _f;});_e.addErrback(function(err){if(!_e.cancelled){_c._onError.call(_c,"Download",err);}delete _c._xhrDfd;return err;});},_onLoadHandler:function(){this.isLoaded=true;try{this.onLoad.call(this);}catch(e){console.error("Error "+this.widgetId+" running custom onLoad code");}},_onUnloadHandler:function(){this.isLoaded=false;this.cancel();try{this.onUnload.call(this);}catch(e){console.error("Error "+this.widgetId+" running custom onUnload code");}},_setContent:function(_11){this.destroyDescendants();try{var _12=this.containerNode||this.domNode;while(_12.firstChild){dojo._destroyElement(_12.firstChild);}if(typeof _11=="string"){if(this.extractContent){match=_11.match(/]*>\s*([\s\S]+)\s*<\/body>/im);if(match){_11=match[1];}}_12.innerHTML=_11;}else{if(_11.nodeType){_12.appendChild(_11);}else{dojo.forEach(_11,function(n){_12.appendChild(n.cloneNode(true));});}}}catch(e){var _14=this.onContentError(e);try{_12.innerHTML=_14;}catch(e){console.error("Fatal "+this.id+" could not change content due to "+e.message,e);}}},_onError:function(_15,err,_17){var _18=this["on"+_15+"Error"].call(this,err);if(_17){console.error(_17,err);}else{if(_18){this._setContent.call(this,_18);}}},_createSubWidgets:function(){var _19=this.containerNode||this.domNode;try{dojo.parser.parse(_19,true);}catch(e){this._onError("Content",e,"Couldn't create widgets in "+this.id+(this.href?" from "+this.href:""));}},onLoad:function(e){},onUnload:function(e){},onDownloadStart:function(){return this.loadingMessage;},onContentError:function(_1c){},onDownloadError:function(_1d){return this.errorMessage;},onDownloadEnd:function(){}});} \ No newline at end of file +if(!dojo._hasResource["dijit.layout.ContentPane"]){dojo._hasResource["dijit.layout.ContentPane"]=true;dojo.provide("dijit.layout.ContentPane");dojo.require("dijit._Widget");dojo.require("dijit.layout._LayoutWidget");dojo.require("dojo.parser");dojo.require("dojo.string");dojo.require("dojo.html");dojo.requireLocalization("dijit","loading",null,"ar,ca,cs,da,de,el,es,fi,fr,he,hu,it,ja,ko,ROOT,nb,nl,pl,pt,pt-pt,ru,sk,sl,sv,th,tr,zh,zh-tw");dojo.declare("dijit.layout.ContentPane",dijit._Widget,{href:"",extractContent:false,parseOnLoad:true,preventCache:false,preload:false,refreshOnShow:false,loadingMessage:"${loadingState}",errorMessage:"${errorState}",isLoaded:false,baseClass:"dijitContentPane",doLayout:true,postMixInProperties:function(){this.inherited(arguments);var _1=dojo.i18n.getLocalization("dijit","loading",this.lang);this.loadingMessage=dojo.string.substitute(this.loadingMessage,_1);this.errorMessage=dojo.string.substitute(this.errorMessage,_1);},buildRendering:function(){this.inherited(arguments);if(!this.containerNode){this.containerNode=this.domNode;}},postCreate:function(){this.domNode.title="";if(!dijit.hasWaiRole(this.domNode)){dijit.setWaiRole(this.domNode,"group");}dojo.addClass(this.domNode,this.baseClass);},startup:function(){if(this._started){return;}if(this.doLayout!="false"&&this.doLayout!==false){this._checkIfSingleChild();if(this._singleChild){this._singleChild.startup();}}this._loadCheck();this.inherited(arguments);},_checkIfSingleChild:function(){var _2=dojo.query(">",this.containerNode),_3=_2.filter(function(_4){return dojo.hasAttr(_4,"dojoType")||dojo.hasAttr(_4,"widgetId");}),_5=dojo.filter(_3.map(dijit.byNode),function(_6){return _6&&_6.domNode&&_6.resize;});if(_2.length==_3.length&&_5.length==1){this.isContainer=true;this._singleChild=_5[0];}else{delete this.isContainer;delete this._singleChild;}},refresh:function(){return this._prepareLoad(true);},setHref:function(_7){dojo.deprecated("dijit.layout.ContentPane.setHref() is deprecated.\tUse attr('href', ...) instead.","","2.0");return this.attr("href",_7);},_setHrefAttr:function(_8){this.href=_8;if(this._created){return this._prepareLoad();}},setContent:function(_9){dojo.deprecated("dijit.layout.ContentPane.setContent() is deprecated. Use attr('content', ...) instead.","","2.0");this.attr("content",_9);},_setContentAttr:function(_a){if(!this._isDownloaded){this.href="";}this._setContent(_a||"");this._isDownloaded=false;if(this.doLayout!="false"&&this.doLayout!==false){this._checkIfSingleChild();if(this._singleChild&&this._singleChild.resize){this._singleChild.startup();var cb=this._contentBox||dojo.contentBox(this.containerNode);this._singleChild.resize({w:cb.w,h:cb.h});}}this._onLoadHandler();},_getContentAttr:function(){return this.containerNode.innerHTML;},cancel:function(){if(this._xhrDfd&&(this._xhrDfd.fired==-1)){this._xhrDfd.cancel();}delete this._xhrDfd;},destroyRecursive:function(_c){if(this._beingDestroyed){return;}this._beingDestroyed=true;this.inherited(arguments);},resize:function(_d){dojo.marginBox(this.domNode,_d);var _e=this.containerNode,mb=dojo.mixin(dojo.marginBox(_e),_d||{});var cb=this._contentBox=dijit.layout.marginBox2contentBox(_e,mb);if(this._singleChild&&this._singleChild.resize){this._singleChild.resize({w:cb.w,h:cb.h});}},_prepareLoad:function(_11){this.cancel();this.isLoaded=false;this._loadCheck(_11);},_isShown:function(){if("open" in this){return this.open;}else{var _12=this.domNode;return (_12.style.display!="none")&&(_12.style.visibility!="hidden");}},_loadCheck:function(_13){var _14=this._isShown();if(this.href&&(_13||(this.preload&&!this.isLoaded&&!this._xhrDfd)||(this.refreshOnShow&&_14&&!this._xhrDfd)||(!this.isLoaded&&_14&&!this._xhrDfd))){this._downloadExternalContent();}},_downloadExternalContent:function(){this._setContent(this.onDownloadStart.call(this));var _15=this;var _16={preventCache:(this.preventCache||this.refreshOnShow),url:this.href,handleAs:"text"};if(dojo.isObject(this.ioArgs)){dojo.mixin(_16,this.ioArgs);}var _17=this._xhrDfd=(this.ioMethod||dojo.xhrGet)(_16);_17.addCallback(function(_18){try{_15._isDownloaded=true;_15.attr.call(_15,"content",_18);_15.onDownloadEnd.call(_15);}catch(err){_15._onError.call(_15,"Content",err);}delete _15._xhrDfd;return _18;});_17.addErrback(function(err){if(!_17.cancelled){_15._onError.call(_15,"Download",err);}delete _15._xhrDfd;return err;});},_onLoadHandler:function(){this.isLoaded=true;try{this.onLoad.call(this);}catch(e){console.error("Error "+this.widgetId+" running custom onLoad code");}},_onUnloadHandler:function(){this.isLoaded=false;this.cancel();try{this.onUnload.call(this);}catch(e){console.error("Error "+this.widgetId+" running custom onUnload code");}},destroyDescendants:function(){this._onUnloadHandler();var _1a=this._contentSetter;if(_1a){_1a.empty();}else{this.inherited(arguments);dojo.html._emptyNode(this.containerNode);}},_setContent:function(_1b){this.destroyDescendants();var _1c=this._contentSetter;if(!(_1c&&_1c instanceof dojo.html._ContentSetter)){_1c=this._contentSetter=new dojo.html._ContentSetter({node:this.containerNode,_onError:dojo.hitch(this,this._onError),onContentError:dojo.hitch(this,function(e){var _1e=this.onContentError(e);try{this.containerNode.innerHTML=_1e;}catch(e){console.error("Fatal "+this.id+" could not change content due to "+e.message,e);}})});}var _1f=dojo.mixin({cleanContent:this.cleanContent,extractContent:this.extractContent,parseContent:this.parseOnLoad},this._contentSetterParams||{});dojo.mixin(_1c,_1f);_1c.set((dojo.isObject(_1b)&&_1b.domNode)?_1b.domNode:_1b);delete this._contentSetterParams;},_onError:function(_20,err,_22){var _23=this["on"+_20+"Error"].call(this,err);if(_22){console.error(_22,err);}else{if(_23){this._setContent.call(this,_23);}}},_createSubWidgets:function(){try{dojo.parser.parse(this.containerNode,true);}catch(e){this._onError("Content",e,"Couldn't create widgets in "+this.id+(this.href?" from "+this.href:""));}},onLoad:function(e){},onUnload:function(e){},onDownloadStart:function(){return this.loadingMessage;},onContentError:function(_26){},onDownloadError:function(_27){return this.errorMessage;},onDownloadEnd:function(){}});} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/layout/LayoutContainer.js b/spring-js/src/main/resources/META-INF/dijit/layout/LayoutContainer.js index 0f05114b..3f1a0142 100644 --- a/spring-js/src/main/resources/META-INF/dijit/layout/LayoutContainer.js +++ b/spring-js/src/main/resources/META-INF/dijit/layout/LayoutContainer.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dijit.layout.LayoutContainer"]){dojo._hasResource["dijit.layout.LayoutContainer"]=true;dojo.provide("dijit.layout.LayoutContainer");dojo.require("dijit.layout._LayoutWidget");dojo.declare("dijit.layout.LayoutContainer",dijit.layout._LayoutWidget,{layout:function(){dijit.layout.layoutChildren(this.domNode,this._contentBox,this.getChildren());},addChild:function(_1,_2){dijit._Container.prototype.addChild.apply(this,arguments);if(this._started){dijit.layout.layoutChildren(this.domNode,this._contentBox,this.getChildren());}},removeChild:function(_3){dijit._Container.prototype.removeChild.apply(this,arguments);if(this._started){dijit.layout.layoutChildren(this.domNode,this._contentBox,this.getChildren());}}});dojo.extend(dijit._Widget,{layoutAlign:"none"});} \ No newline at end of file +if(!dojo._hasResource["dijit.layout.LayoutContainer"]){dojo._hasResource["dijit.layout.LayoutContainer"]=true;dojo.provide("dijit.layout.LayoutContainer");dojo.require("dijit.layout._LayoutWidget");dojo.declare("dijit.layout.LayoutContainer",dijit.layout._LayoutWidget,{baseClass:"dijitLayoutContainer",constructor:function(){dojo.deprecated("dijit.layout.LayoutContainer is deprecated","use BorderContainer instead",2);},layout:function(){dijit.layout.layoutChildren(this.domNode,this._contentBox,this.getChildren());},addChild:function(_1,_2){this.inherited(arguments);if(this._started){dijit.layout.layoutChildren(this.domNode,this._contentBox,this.getChildren());}},removeChild:function(_3){this.inherited(arguments);if(this._started){dijit.layout.layoutChildren(this.domNode,this._contentBox,this.getChildren());}}});dojo.extend(dijit._Widget,{layoutAlign:"none"});} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/layout/LinkPane.js b/spring-js/src/main/resources/META-INF/dijit/layout/LinkPane.js index f7e974e8..2dbd3fb9 100644 --- a/spring-js/src/main/resources/META-INF/dijit/layout/LinkPane.js +++ b/spring-js/src/main/resources/META-INF/dijit/layout/LinkPane.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dijit.layout.LinkPane"]){dojo._hasResource["dijit.layout.LinkPane"]=true;dojo.provide("dijit.layout.LinkPane");dojo.require("dijit.layout.ContentPane");dojo.require("dijit._Templated");dojo.declare("dijit.layout.LinkPane",[dijit.layout.ContentPane,dijit._Templated],{templateString:"
",postCreate:function(){if(this.srcNodeRef){this.title+=this.srcNodeRef.innerHTML;}this.inherited("postCreate",arguments);}});} \ No newline at end of file +if(!dojo._hasResource["dijit.layout.LinkPane"]){dojo._hasResource["dijit.layout.LinkPane"]=true;dojo.provide("dijit.layout.LinkPane");dojo.require("dijit.layout.ContentPane");dojo.require("dijit._Templated");dojo.declare("dijit.layout.LinkPane",[dijit.layout.ContentPane,dijit._Templated],{templateString:"
",buildRendering:function(){this.inherited(arguments);this.containerNode=this.domNode;},postCreate:function(){if(this.srcNodeRef){this.title+=this.srcNodeRef.innerHTML;}this.inherited("postCreate",arguments);}});} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/layout/SplitContainer.js b/spring-js/src/main/resources/META-INF/dijit/layout/SplitContainer.js index c13a515c..1197398c 100644 --- a/spring-js/src/main/resources/META-INF/dijit/layout/SplitContainer.js +++ b/spring-js/src/main/resources/META-INF/dijit/layout/SplitContainer.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dijit.layout.SplitContainer"]){dojo._hasResource["dijit.layout.SplitContainer"]=true;dojo.provide("dijit.layout.SplitContainer");dojo.require("dojo.cookie");dojo.require("dijit.layout._LayoutWidget");dojo.declare("dijit.layout.SplitContainer",dijit.layout._LayoutWidget,{activeSizing:false,sizerWidth:7,orientation:"horizontal",persist:true,postMixInProperties:function(){this.inherited("postMixInProperties",arguments);this.isHorizontal=(this.orientation=="horizontal");},postCreate:function(){this.inherited("postCreate",arguments);this.sizers=[];dojo.addClass(this.domNode,"dijitSplitContainer");if(dojo.isMozilla){this.domNode.style.overflow="-moz-scrollbars-none";}if(typeof this.sizerWidth=="object"){try{this.sizerWidth=parseInt(this.sizerWidth.toString());}catch(e){this.sizerWidth=7;}}var _1=this.virtualSizer=document.createElement("div");_1.style.position="relative";_1.style.zIndex=10;_1.className=this.isHorizontal?"dijitSplitContainerVirtualSizerH":"dijitSplitContainerVirtualSizerV";this.domNode.appendChild(_1);dojo.setSelectable(_1,false);},startup:function(){if(this._started){return;}dojo.forEach(this.getChildren(),function(_2,i,_4){this._injectChild(_2);if(i<_4.length-1){this._addSizer();}},this);if(this.persist){this._restoreState();}this.inherited("startup",arguments);this._started=true;},_injectChild:function(_5){_5.domNode.style.position="absolute";dojo.addClass(_5.domNode,"dijitSplitPane");},_addSizer:function(){var i=this.sizers.length;var _7=this.sizers[i]=document.createElement("div");_7.className=this.isHorizontal?"dijitSplitContainerSizerH":"dijitSplitContainerSizerV";var _8=document.createElement("div");_8.className="thumb";_7.appendChild(_8);var _9=this;var _a=(function(){var _b=i;return function(e){_9.beginSizing(e,_b);};})();dojo.connect(_7,"onmousedown",_a);this.domNode.appendChild(_7);dojo.setSelectable(_7,false);},removeChild:function(_d){if(this.sizers.length&&dojo.indexOf(this.getChildren(),_d)!=-1){var i=this.sizers.length-1;dojo._destroyElement(this.sizers[i]);this.sizers.length--;}this.inherited("removeChild",arguments);if(this._started){this.layout();}},addChild:function(_f,_10){this.inherited("addChild",arguments);if(this._started){this._injectChild(_f);var _11=this.getChildren();if(_11.length>1){this._addSizer();}this.layout();}},layout:function(){this.paneWidth=this._contentBox.w;this.paneHeight=this._contentBox.h;var _12=this.getChildren();if(!_12.length){return;}var _13=this.isHorizontal?this.paneWidth:this.paneHeight;if(_12.length>1){_13-=this.sizerWidth*(_12.length-1);}var _14=0;dojo.forEach(_12,function(_15){_14+=_15.sizeShare;});var _16=_13/_14;var _17=0;dojo.forEach(_12.slice(0,_12.length-1),function(_18){var _19=Math.round(_16*_18.sizeShare);_18.sizeActual=_19;_17+=_19;});_12[_12.length-1].sizeActual=_13-_17;this._checkSizes();var pos=0;var _1b=_12[0].sizeActual;this._movePanel(_12[0],pos,_1b);_12[0].position=pos;pos+=_1b;if(!this.sizers){return;}dojo.some(_12.slice(1),function(_1c,i){if(!this.sizers[i]){return true;}this._moveSlider(this.sizers[i],pos,this.sizerWidth);this.sizers[i].position=pos;pos+=this.sizerWidth;_1b=_1c.sizeActual;this._movePanel(_1c,pos,_1b);_1c.position=pos;pos+=_1b;},this);},_movePanel:function(_1e,pos,_20){if(this.isHorizontal){_1e.domNode.style.left=pos+"px";_1e.domNode.style.top=0;var box={w:_20,h:this.paneHeight};if(_1e.resize){_1e.resize(box);}else{dojo.marginBox(_1e.domNode,box);}}else{_1e.domNode.style.left=0;_1e.domNode.style.top=pos+"px";var box={w:this.paneWidth,h:_20};if(_1e.resize){_1e.resize(box);}else{dojo.marginBox(_1e.domNode,box);}}},_moveSlider:function(_22,pos,_24){if(this.isHorizontal){_22.style.left=pos+"px";_22.style.top=0;dojo.marginBox(_22,{w:_24,h:this.paneHeight});}else{_22.style.left=0;_22.style.top=pos+"px";dojo.marginBox(_22,{w:this.paneWidth,h:_24});}},_growPane:function(_25,_26){if(_25>0){if(_26.sizeActual>_26.sizeMin){if((_26.sizeActual-_26.sizeMin)>_25){_26.sizeActual=_26.sizeActual-_25;_25=0;}else{_25-=_26.sizeActual-_26.sizeMin;_26.sizeActual=_26.sizeMin;}}}return _25;},_checkSizes:function(){var _27=0;var _28=0;var _29=this.getChildren();dojo.forEach(_29,function(_2a){_28+=_2a.sizeActual;_27+=_2a.sizeMin;});if(_27<=_28){var _2b=0;dojo.forEach(_29,function(_2c){if(_2c.sizeActual<_2c.sizeMin){_2b+=_2c.sizeMin-_2c.sizeActual;_2c.sizeActual=_2c.sizeMin;}});if(_2b>0){var _2d=this.isDraggingLeft?_29.reverse():_29;dojo.forEach(_2d,function(_2e){_2b=this._growPane(_2b,_2e);},this);}}else{dojo.forEach(_29,function(_2f){_2f.sizeActual=Math.round(_28*(_2f.sizeMin/_27));});}},beginSizing:function(e,i){var _32=this.getChildren();this.paneBefore=_32[i];this.paneAfter=_32[i+1];this.isSizing=true;this.sizingSplitter=this.sizers[i];if(!this.cover){this.cover=dojo.doc.createElement("div");this.domNode.appendChild(this.cover);var s=this.cover.style;s.position="absolute";s.zIndex=1;s.top=0;s.left=0;s.width="100%";s.height="100%";}else{this.cover.style.zIndex=1;}this.sizingSplitter.style.zIndex=2;this.originPos=dojo.coords(_32[0].domNode,true);if(this.isHorizontal){var _34=(e.layerX?e.layerX:e.offsetX);var _35=e.pageX;this.originPos=this.originPos.x;}else{var _34=(e.layerY?e.layerY:e.offsetY);var _35=e.pageY;this.originPos=this.originPos.y;}this.startPoint=this.lastPoint=_35;this.screenToClientOffset=_35-_34;this.dragOffset=this.lastPoint-this.paneBefore.sizeActual-this.originPos-this.paneBefore.position;if(!this.activeSizing){this._showSizingLine();}this._connects=[];this._connects.push(dojo.connect(document.documentElement,"onmousemove",this,"changeSizing"));this._connects.push(dojo.connect(document.documentElement,"onmouseup",this,"endSizing"));dojo.stopEvent(e);},changeSizing:function(e){if(!this.isSizing){return;}this.lastPoint=this.isHorizontal?e.pageX:e.pageY;this.movePoint();if(this.activeSizing){this._updateSize();}else{this._moveSizingLine();}dojo.stopEvent(e);},endSizing:function(e){if(!this.isSizing){return;}if(this.cover){this.cover.style.zIndex=-1;}if(!this.activeSizing){this._hideSizingLine();}this._updateSize();this.isSizing=false;if(this.persist){this._saveState(this);}dojo.forEach(this._connects,dojo.disconnect);},movePoint:function(){var p=this.lastPoint-this.screenToClientOffset;var a=p-this.dragOffset;a=this.legaliseSplitPoint(a);p=a+this.dragOffset;this.lastPoint=p+this.screenToClientOffset;},legaliseSplitPoint:function(a){a+=this.sizingSplitter.position;this.isDraggingLeft=!!(a>0);if(!this.activeSizing){var min=this.paneBefore.position+this.paneBefore.sizeMin;if(amax){a=max;}}a-=this.sizingSplitter.position;this._checkSizes();return a;},_updateSize:function(){var pos=this.lastPoint-this.dragOffset-this.originPos;var _3e=this.paneBefore.position;var _3f=this.paneAfter.position+this.paneAfter.sizeActual;this.paneBefore.sizeActual=pos-_3e;this.paneAfter.position=pos+this.sizerWidth;this.paneAfter.sizeActual=_3f-this.paneAfter.position;dojo.forEach(this.getChildren(),function(_40){_40.sizeShare=_40.sizeActual;});if(this._started){this.layout();}},_showSizingLine:function(){this._moveSizingLine();dojo.marginBox(this.virtualSizer,this.isHorizontal?{w:this.sizerWidth,h:this.paneHeight}:{w:this.paneWidth,h:this.sizerWidth});this.virtualSizer.style.display="block";},_hideSizingLine:function(){this.virtualSizer.style.display="none";},_moveSizingLine:function(){var pos=(this.lastPoint-this.startPoint)+this.sizingSplitter.position;dojo.style(this.virtualSizer,(this.isHorizontal?"left":"top"),pos+"px");},_getCookieName:function(i){return this.id+"_"+i;},_restoreState:function(){dojo.forEach(this.getChildren(),function(_43,i){var _45=this._getCookieName(i);var _46=dojo.cookie(_45);if(_46){var pos=parseInt(_46);if(typeof pos=="number"){_43.sizeShare=pos;}}},this);},_saveState:function(){dojo.forEach(this.getChildren(),function(_48,i){dojo.cookie(this._getCookieName(i),_48.sizeShare);},this);}});dojo.extend(dijit._Widget,{sizeMin:10,sizeShare:10});} \ No newline at end of file +if(!dojo._hasResource["dijit.layout.SplitContainer"]){dojo._hasResource["dijit.layout.SplitContainer"]=true;dojo.provide("dijit.layout.SplitContainer");dojo.require("dojo.cookie");dojo.require("dijit.layout._LayoutWidget");dojo.declare("dijit.layout.SplitContainer",dijit.layout._LayoutWidget,{constructor:function(){dojo.deprecated("dijit.layout.SplitContainer is deprecated","use BorderContainer with splitter instead",2);},activeSizing:false,sizerWidth:7,orientation:"horizontal",persist:true,baseClass:"dijitSplitContainer",postMixInProperties:function(){this.inherited("postMixInProperties",arguments);this.isHorizontal=(this.orientation=="horizontal");},postCreate:function(){this.inherited(arguments);this.sizers=[];if(dojo.isMozilla){this.domNode.style.overflow="-moz-scrollbars-none";}if(typeof this.sizerWidth=="object"){try{this.sizerWidth=parseInt(this.sizerWidth.toString());}catch(e){this.sizerWidth=7;}}var _1=this.virtualSizer=dojo.doc.createElement("div");_1.style.position="relative";_1.style.zIndex=10;_1.className=this.isHorizontal?"dijitSplitContainerVirtualSizerH":"dijitSplitContainerVirtualSizerV";this.domNode.appendChild(_1);dojo.setSelectable(_1,false);},destroy:function(){delete this.virtualSizer;dojo.forEach(this._ownconnects,dojo.disconnect);this.inherited(arguments);},startup:function(){if(this._started){return;}dojo.forEach(this.getChildren(),function(_2,i,_4){this._setupChild(_2);if(i<_4.length-1){this._addSizer();}},this);if(this.persist){this._restoreState();}this.inherited(arguments);},_setupChild:function(_5){this.inherited(arguments);_5.domNode.style.position="absolute";dojo.addClass(_5.domNode,"dijitSplitPane");},_addSizer:function(){var i=this.sizers.length;var _7=this.sizers[i]=dojo.doc.createElement("div");this.domNode.appendChild(_7);_7.className=this.isHorizontal?"dijitSplitContainerSizerH":"dijitSplitContainerSizerV";var _8=dojo.doc.createElement("div");_8.className="thumb";_7.appendChild(_8);var _9=this;var _a=(function(){var _b=i;return function(e){_9.beginSizing(e,_b);};})();this.connect(_7,"onmousedown",_a);dojo.setSelectable(_7,false);},removeChild:function(_d){if(this.sizers.length){var i=dojo.indexOf(this.getChildren(),_d);if(i!=-1){if(i==this.sizers.length){i--;}dojo._destroyElement(this.sizers[i]);this.sizers.splice(i,1);}}this.inherited(arguments);if(this._started){this.layout();}},addChild:function(_f,_10){this.inherited(arguments);if(this._started){var _11=this.getChildren();if(_11.length>1){this._addSizer();}this.layout();}},layout:function(){this.paneWidth=this._contentBox.w;this.paneHeight=this._contentBox.h;var _12=this.getChildren();if(!_12.length){return;}var _13=this.isHorizontal?this.paneWidth:this.paneHeight;if(_12.length>1){_13-=this.sizerWidth*(_12.length-1);}var _14=0;dojo.forEach(_12,function(_15){_14+=_15.sizeShare;});var _16=_13/_14;var _17=0;dojo.forEach(_12.slice(0,_12.length-1),function(_18){var _19=Math.round(_16*_18.sizeShare);_18.sizeActual=_19;_17+=_19;});_12[_12.length-1].sizeActual=_13-_17;this._checkSizes();var pos=0;var _1b=_12[0].sizeActual;this._movePanel(_12[0],pos,_1b);_12[0].position=pos;pos+=_1b;if(!this.sizers){return;}dojo.some(_12.slice(1),function(_1c,i){if(!this.sizers[i]){return true;}this._moveSlider(this.sizers[i],pos,this.sizerWidth);this.sizers[i].position=pos;pos+=this.sizerWidth;_1b=_1c.sizeActual;this._movePanel(_1c,pos,_1b);_1c.position=pos;pos+=_1b;},this);},_movePanel:function(_1e,pos,_20){if(this.isHorizontal){_1e.domNode.style.left=pos+"px";_1e.domNode.style.top=0;var box={w:_20,h:this.paneHeight};if(_1e.resize){_1e.resize(box);}else{dojo.marginBox(_1e.domNode,box);}}else{_1e.domNode.style.left=0;_1e.domNode.style.top=pos+"px";var box={w:this.paneWidth,h:_20};if(_1e.resize){_1e.resize(box);}else{dojo.marginBox(_1e.domNode,box);}}},_moveSlider:function(_22,pos,_24){if(this.isHorizontal){_22.style.left=pos+"px";_22.style.top=0;dojo.marginBox(_22,{w:_24,h:this.paneHeight});}else{_22.style.left=0;_22.style.top=pos+"px";dojo.marginBox(_22,{w:this.paneWidth,h:_24});}},_growPane:function(_25,_26){if(_25>0){if(_26.sizeActual>_26.sizeMin){if((_26.sizeActual-_26.sizeMin)>_25){_26.sizeActual=_26.sizeActual-_25;_25=0;}else{_25-=_26.sizeActual-_26.sizeMin;_26.sizeActual=_26.sizeMin;}}}return _25;},_checkSizes:function(){var _27=0;var _28=0;var _29=this.getChildren();dojo.forEach(_29,function(_2a){_28+=_2a.sizeActual;_27+=_2a.sizeMin;});if(_27<=_28){var _2b=0;dojo.forEach(_29,function(_2c){if(_2c.sizeActual<_2c.sizeMin){_2b+=_2c.sizeMin-_2c.sizeActual;_2c.sizeActual=_2c.sizeMin;}});if(_2b>0){var _2d=this.isDraggingLeft?_29.reverse():_29;dojo.forEach(_2d,function(_2e){_2b=this._growPane(_2b,_2e);},this);}}else{dojo.forEach(_29,function(_2f){_2f.sizeActual=Math.round(_28*(_2f.sizeMin/_27));});}},beginSizing:function(e,i){var _32=this.getChildren();this.paneBefore=_32[i];this.paneAfter=_32[i+1];this.isSizing=true;this.sizingSplitter=this.sizers[i];if(!this.cover){this.cover=dojo.doc.createElement("div");this.domNode.appendChild(this.cover);var s=this.cover.style;s.position="absolute";s.zIndex=1;s.top=0;s.left=0;s.width="100%";s.height="100%";}else{this.cover.style.zIndex=1;}this.sizingSplitter.style.zIndex=2;this.originPos=dojo.coords(_32[0].domNode,true);if(this.isHorizontal){var _34=e.layerX||e.offsetX||0;var _35=e.pageX;this.originPos=this.originPos.x;}else{var _34=e.layerY||e.offsetY||0;var _35=e.pageY;this.originPos=this.originPos.y;}this.startPoint=this.lastPoint=_35;this.screenToClientOffset=_35-_34;this.dragOffset=this.lastPoint-this.paneBefore.sizeActual-this.originPos-this.paneBefore.position;if(!this.activeSizing){this._showSizingLine();}this._ownconnects=[];this._ownconnects.push(dojo.connect(dojo.doc.documentElement,"onmousemove",this,"changeSizing"));this._ownconnects.push(dojo.connect(dojo.doc.documentElement,"onmouseup",this,"endSizing"));dojo.stopEvent(e);},changeSizing:function(e){if(!this.isSizing){return;}this.lastPoint=this.isHorizontal?e.pageX:e.pageY;this.movePoint();if(this.activeSizing){this._updateSize();}else{this._moveSizingLine();}dojo.stopEvent(e);},endSizing:function(e){if(!this.isSizing){return;}if(this.cover){this.cover.style.zIndex=-1;}if(!this.activeSizing){this._hideSizingLine();}this._updateSize();this.isSizing=false;if(this.persist){this._saveState(this);}dojo.forEach(this._ownconnects,dojo.disconnect);},movePoint:function(){var p=this.lastPoint-this.screenToClientOffset;var a=p-this.dragOffset;a=this.legaliseSplitPoint(a);p=a+this.dragOffset;this.lastPoint=p+this.screenToClientOffset;},legaliseSplitPoint:function(a){a+=this.sizingSplitter.position;this.isDraggingLeft=!!(a>0);if(!this.activeSizing){var min=this.paneBefore.position+this.paneBefore.sizeMin;if(amax){a=max;}}a-=this.sizingSplitter.position;this._checkSizes();return a;},_updateSize:function(){var pos=this.lastPoint-this.dragOffset-this.originPos;var _3e=this.paneBefore.position;var _3f=this.paneAfter.position+this.paneAfter.sizeActual;this.paneBefore.sizeActual=pos-_3e;this.paneAfter.position=pos+this.sizerWidth;this.paneAfter.sizeActual=_3f-this.paneAfter.position;dojo.forEach(this.getChildren(),function(_40){_40.sizeShare=_40.sizeActual;});if(this._started){this.layout();}},_showSizingLine:function(){this._moveSizingLine();dojo.marginBox(this.virtualSizer,this.isHorizontal?{w:this.sizerWidth,h:this.paneHeight}:{w:this.paneWidth,h:this.sizerWidth});this.virtualSizer.style.display="block";},_hideSizingLine:function(){this.virtualSizer.style.display="none";},_moveSizingLine:function(){var pos=(this.lastPoint-this.startPoint)+this.sizingSplitter.position;dojo.style(this.virtualSizer,(this.isHorizontal?"left":"top"),pos+"px");},_getCookieName:function(i){return this.id+"_"+i;},_restoreState:function(){dojo.forEach(this.getChildren(),function(_43,i){var _45=this._getCookieName(i);var _46=dojo.cookie(_45);if(_46){var pos=parseInt(_46);if(typeof pos=="number"){_43.sizeShare=pos;}}},this);},_saveState:function(){if(!this.persist){return;}dojo.forEach(this.getChildren(),function(_48,i){dojo.cookie(this._getCookieName(i),_48.sizeShare,{expires:365});},this);}});dojo.extend(dijit._Widget,{sizeMin:10,sizeShare:10});} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/layout/StackContainer.js b/spring-js/src/main/resources/META-INF/dijit/layout/StackContainer.js index 83284681..2ecd4e00 100644 --- a/spring-js/src/main/resources/META-INF/dijit/layout/StackContainer.js +++ b/spring-js/src/main/resources/META-INF/dijit/layout/StackContainer.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dijit.layout.StackContainer"]){dojo._hasResource["dijit.layout.StackContainer"]=true;dojo.provide("dijit.layout.StackContainer");dojo.require("dijit._Templated");dojo.require("dijit.layout._LayoutWidget");dojo.require("dijit.form.Button");dojo.declare("dijit.layout.StackContainer",dijit.layout._LayoutWidget,{doLayout:true,_started:false,postCreate:function(){dijit.setWaiRole((this.containerNode||this.domNode),"tabpanel");this.connect(this.domNode,"onkeypress",this._onKeyPress);},startup:function(){if(this._started){return;}var _1=this.getChildren();dojo.forEach(_1,this._setupChild,this);dojo.some(_1,function(_2){if(_2.selected){this.selectedChildWidget=_2;}return _2.selected;},this);var _3=this.selectedChildWidget;if(!_3&&_1[0]){_3=this.selectedChildWidget=_1[0];_3.selected=true;}if(_3){this._showChild(_3);}dojo.publish(this.id+"-startup",[{children:_1,selected:_3}]);this.inherited("startup",arguments);this._started=true;},_setupChild:function(_4){_4.domNode.style.display="none";_4.domNode.style.position="relative";return _4;},addChild:function(_5,_6){dijit._Container.prototype.addChild.apply(this,arguments);_5=this._setupChild(_5);if(this._started){this.layout();dojo.publish(this.id+"-addChild",[_5,_6]);if(!this.selectedChildWidget){this.selectChild(_5);}}},removeChild:function(_7){dijit._Container.prototype.removeChild.apply(this,arguments);if(this._beingDestroyed){return;}if(this._started){dojo.publish(this.id+"-removeChild",[_7]);this.layout();}if(this.selectedChildWidget===_7){this.selectedChildWidget=undefined;if(this._started){var _8=this.getChildren();if(_8.length){this.selectChild(_8[0]);}}}},selectChild:function(_9){_9=dijit.byId(_9);if(this.selectedChildWidget!=_9){this._transition(_9,this.selectedChildWidget);this.selectedChildWidget=_9;dojo.publish(this.id+"-selectChild",[_9]);}},_transition:function(_a,_b){if(_b){this._hideChild(_b);}this._showChild(_a);if(this.doLayout&&_a.resize){_a.resize(this._containerContentBox||this._contentBox);}},_adjacent:function(_c){var _d=this.getChildren();var _e=dojo.indexOf(_d,this.selectedChildWidget);_e+=_c?1:_d.length-1;return _d[_e%_d.length];},forward:function(){this.selectChild(this._adjacent(true));},back:function(){this.selectChild(this._adjacent(false));},_onKeyPress:function(e){dojo.publish(this.id+"-containerKeyPress",[{e:e,page:this}]);},layout:function(){if(this.doLayout&&this.selectedChildWidget&&this.selectedChildWidget.resize){this.selectedChildWidget.resize(this._contentBox);}},_showChild:function(_10){var _11=this.getChildren();_10.isFirstChild=(_10==_11[0]);_10.isLastChild=(_10==_11[_11.length-1]);_10.selected=true;_10.domNode.style.display="";if(_10._loadCheck){_10._loadCheck();}if(_10.onShow){_10.onShow();}},_hideChild:function(_12){_12.selected=false;_12.domNode.style.display="none";if(_12.onHide){_12.onHide();}},closeChild:function(_13){var _14=_13.onClose(this,_13);if(_14){this.removeChild(_13);_13.destroy();}},destroy:function(){this._beingDestroyed=true;this.inherited("destroy",arguments);}});dojo.declare("dijit.layout.StackController",[dijit._Widget,dijit._Templated,dijit._Container],{templateString:"",containerId:"",buttonWidget:"dijit.layout._StackButton",postCreate:function(){dijit.setWaiRole(this.domNode,"tablist");this.pane2button={};this._subscriptions=[dojo.subscribe(this.containerId+"-startup",this,"onStartup"),dojo.subscribe(this.containerId+"-addChild",this,"onAddChild"),dojo.subscribe(this.containerId+"-removeChild",this,"onRemoveChild"),dojo.subscribe(this.containerId+"-selectChild",this,"onSelectChild"),dojo.subscribe(this.containerId+"-containerKeyPress",this,"onContainerKeyPress")];},onStartup:function(_15){dojo.forEach(_15.children,this.onAddChild,this);this.onSelectChild(_15.selected);},destroy:function(){dojo.forEach(this._subscriptions,dojo.unsubscribe);this.inherited("destroy",arguments);},onAddChild:function(_16,_17){var _18=document.createElement("span");this.domNode.appendChild(_18);var cls=dojo.getObject(this.buttonWidget);var _1a=new cls({label:_16.title,closeButton:_16.closable},_18);this.addChild(_1a,_17);this.pane2button[_16]=_1a;_16.controlButton=_1a;dojo.connect(_1a,"onClick",dojo.hitch(this,"onButtonClick",_16));dojo.connect(_1a,"onClickCloseButton",dojo.hitch(this,"onCloseButtonClick",_16));if(!this._currentChild){_1a.focusNode.setAttribute("tabIndex","0");this._currentChild=_16;}},onRemoveChild:function(_1b){if(this._currentChild===_1b){this._currentChild=null;}var _1c=this.pane2button[_1b];if(_1c){_1c.destroy();}this.pane2button[_1b]=null;},onSelectChild:function(_1d){if(!_1d){return;}if(this._currentChild){var _1e=this.pane2button[this._currentChild];_1e.setChecked(false);_1e.focusNode.setAttribute("tabIndex","-1");}var _1f=this.pane2button[_1d];_1f.setChecked(true);this._currentChild=_1d;_1f.focusNode.setAttribute("tabIndex","0");},onButtonClick:function(_20){var _21=dijit.byId(this.containerId);_21.selectChild(_20);},onCloseButtonClick:function(_22){var _23=dijit.byId(this.containerId);_23.closeChild(_22);var b=this.pane2button[this._currentChild];if(b){dijit.focus(b.focusNode||b.domNode);}},adjacent:function(_25){var _26=this.getChildren();var _27=dojo.indexOf(_26,this.pane2button[this._currentChild]);var _28=_25?1:_26.length-1;return _26[(_27+_28)%_26.length];},onkeypress:function(e){if(this.disabled||e.altKey){return;}var _2a=true;if(e.ctrlKey||!e._djpage){var k=dojo.keys;switch(e.keyCode){case k.LEFT_ARROW:case k.UP_ARROW:case k.PAGE_UP:_2a=false;case k.RIGHT_ARROW:case k.DOWN_ARROW:case k.PAGE_DOWN:this.adjacent(_2a).onClick();dojo.stopEvent(e);break;case k.DELETE:if(this._currentChild.closable){this.onCloseButtonClick(this._currentChild);}dojo.stopEvent(e);break;default:if(e.ctrlKey){if(e.keyCode==k.TAB){this.adjacent(!e.shiftKey).onClick();dojo.stopEvent(e);}else{if(e.keyChar=="w"){if(this._currentChild.closable){this.onCloseButtonClick(this._currentChild);}dojo.stopEvent(e);}}}}}},onContainerKeyPress:function(_2c){_2c.e._djpage=_2c.page;this.onkeypress(_2c.e);}});dojo.declare("dijit.layout._StackButton",dijit.form.ToggleButton,{tabIndex:"-1",postCreate:function(evt){dijit.setWaiRole((this.focusNode||this.domNode),"tab");this.inherited("postCreate",arguments);},onClick:function(evt){dijit.focus(this.focusNode);},onClickCloseButton:function(evt){evt.stopPropagation();}});dojo.extend(dijit._Widget,{title:"",selected:false,closable:false,onClose:function(){return true;}});} \ No newline at end of file +if(!dojo._hasResource["dijit.layout.StackContainer"]){dojo._hasResource["dijit.layout.StackContainer"]=true;dojo.provide("dijit.layout.StackContainer");dojo.require("dijit._Templated");dojo.require("dijit.layout._LayoutWidget");dojo.require("dijit.form.Button");dojo.require("dijit.Menu");dojo.requireLocalization("dijit","common",null,"ar,ca,ROOT,cs,da,de,el,es,fi,fr,he,hu,it,ja,ko,nb,nl,pl,pt,pt-pt,ru,sk,sl,sv,th,tr,zh,zh-tw");dojo.declare("dijit.layout.StackContainer",dijit.layout._LayoutWidget,{doLayout:true,baseClass:"dijitStackContainer",_started:false,postCreate:function(){this.inherited(arguments);dijit.setWaiRole(this.containerNode,"tabpanel");this.connect(this.domNode,"onkeypress",this._onKeyPress);},startup:function(){if(this._started){return;}var _1=this.getChildren();dojo.forEach(_1,this._setupChild,this);dojo.some(_1,function(_2){if(_2.selected){this.selectedChildWidget=_2;}return _2.selected;},this);var _3=this.selectedChildWidget;if(!_3&&_1[0]){_3=this.selectedChildWidget=_1[0];_3.selected=true;}if(_3){this._showChild(_3);}dojo.publish(this.id+"-startup",[{children:_1,selected:_3}]);this.inherited(arguments);},_setupChild:function(_4){this.inherited(arguments);_4.domNode.style.display="none";_4.domNode.style.position="relative";_4.domNode.title="";return _4;},addChild:function(_5,_6){this.inherited(arguments);if(this._started){dojo.publish(this.id+"-addChild",[_5,_6]);this.layout();if(!this.selectedChildWidget){this.selectChild(_5);}}},removeChild:function(_7){this.inherited(arguments);if(this._beingDestroyed){return;}if(this._started){dojo.publish(this.id+"-removeChild",[_7]);this.layout();}if(this.selectedChildWidget===_7){this.selectedChildWidget=undefined;if(this._started){var _8=this.getChildren();if(_8.length){this.selectChild(_8[0]);}}}},selectChild:function(_9){_9=dijit.byId(_9);if(this.selectedChildWidget!=_9){this._transition(_9,this.selectedChildWidget);this.selectedChildWidget=_9;dojo.publish(this.id+"-selectChild",[_9]);}},_transition:function(_a,_b){if(_b){this._hideChild(_b);}this._showChild(_a);if(this.doLayout&&_a.resize){_a.resize(this._containerContentBox||this._contentBox);}},_adjacent:function(_c){var _d=this.getChildren();var _e=dojo.indexOf(_d,this.selectedChildWidget);_e+=_c?1:_d.length-1;return _d[_e%_d.length];},forward:function(){this.selectChild(this._adjacent(true));},back:function(){this.selectChild(this._adjacent(false));},_onKeyPress:function(e){dojo.publish(this.id+"-containerKeyPress",[{e:e,page:this}]);},layout:function(){if(this.doLayout&&this.selectedChildWidget&&this.selectedChildWidget.resize){this.selectedChildWidget.resize(this._contentBox);}},_showChild:function(_10){var _11=this.getChildren();_10.isFirstChild=(_10==_11[0]);_10.isLastChild=(_10==_11[_11.length-1]);_10.selected=true;_10.domNode.style.display="";if(_10._loadCheck){_10._loadCheck();}if(_10.onShow){_10.onShow();}},_hideChild:function(_12){_12.selected=false;_12.domNode.style.display="none";if(_12.onHide){_12.onHide();}},closeChild:function(_13){var _14=_13.onClose(this,_13);if(_14){this.removeChild(_13);_13.destroyRecursive();}},destroy:function(){this._beingDestroyed=true;this.inherited(arguments);}});dojo.declare("dijit.layout.StackController",[dijit._Widget,dijit._Templated,dijit._Container],{templateString:"",containerId:"",buttonWidget:"dijit.layout._StackButton",postCreate:function(){dijit.setWaiRole(this.domNode,"tablist");this.pane2button={};this.pane2handles={};this.pane2menu={};this._subscriptions=[dojo.subscribe(this.containerId+"-startup",this,"onStartup"),dojo.subscribe(this.containerId+"-addChild",this,"onAddChild"),dojo.subscribe(this.containerId+"-removeChild",this,"onRemoveChild"),dojo.subscribe(this.containerId+"-selectChild",this,"onSelectChild"),dojo.subscribe(this.containerId+"-containerKeyPress",this,"onContainerKeyPress")];},onStartup:function(_15){dojo.forEach(_15.children,this.onAddChild,this);this.onSelectChild(_15.selected);},destroy:function(){for(var _16 in this.pane2button){this.onRemoveChild(_16);}dojo.forEach(this._subscriptions,dojo.unsubscribe);this.inherited(arguments);},onAddChild:function(_17,_18){var _19=dojo.doc.createElement("span");this.domNode.appendChild(_19);var cls=dojo.getObject(this.buttonWidget);var _1b=new cls({label:_17.title,closeButton:_17.closable},_19);this.addChild(_1b,_18);this.pane2button[_17]=_1b;_17.controlButton=_1b;var _1c=[];_1c.push(dojo.connect(_1b,"onClick",dojo.hitch(this,"onButtonClick",_17)));if(_17.closable){_1c.push(dojo.connect(_1b,"onClickCloseButton",dojo.hitch(this,"onCloseButtonClick",_17)));var _1d=dojo.i18n.getLocalization("dijit","common");var _1e=new dijit.Menu({targetNodeIds:[_1b.id],id:_1b.id+"_Menu"});var _1f=new dijit.MenuItem({label:_1d.itemClose});_1c.push(dojo.connect(_1f,"onClick",dojo.hitch(this,"onCloseButtonClick",_17)));_1e.addChild(_1f);this.pane2menu[_17]=_1e;}this.pane2handles[_17]=_1c;if(!this._currentChild){_1b.focusNode.setAttribute("tabIndex","0");this._currentChild=_17;}if(!this.isLeftToRight()&&dojo.isIE&&this._rectifyRtlTabList){this._rectifyRtlTabList();}},onRemoveChild:function(_20){if(this._currentChild===_20){this._currentChild=null;}dojo.forEach(this.pane2handles[_20],dojo.disconnect);delete this.pane2handles[_20];var _21=this.pane2menu[_20];if(_21){_21.destroyRecursive();delete this.pane2menu[_20];}var _22=this.pane2button[_20];if(_22){_22.destroy();delete this.pane2button[_20];}},onSelectChild:function(_23){if(!_23){return;}if(this._currentChild){var _24=this.pane2button[this._currentChild];_24.attr("checked",false);_24.focusNode.setAttribute("tabIndex","-1");}var _25=this.pane2button[_23];_25.attr("checked",true);this._currentChild=_23;_25.focusNode.setAttribute("tabIndex","0");var _26=dijit.byId(this.containerId);dijit.setWaiState(_26.containerNode,"labelledby",_25.id);},onButtonClick:function(_27){var _28=dijit.byId(this.containerId);_28.selectChild(_27);},onCloseButtonClick:function(_29){var _2a=dijit.byId(this.containerId);_2a.closeChild(_29);var b=this.pane2button[this._currentChild];if(b){dijit.focus(b.focusNode||b.domNode);}},adjacent:function(_2c){if(!this.isLeftToRight()&&(!this.tabPosition||/top|bottom/.test(this.tabPosition))){_2c=!_2c;}var _2d=this.getChildren();var _2e=dojo.indexOf(_2d,this.pane2button[this._currentChild]);var _2f=_2c?1:_2d.length-1;return _2d[(_2e+_2f)%_2d.length];},onkeypress:function(e){if(this.disabled||e.altKey){return;}var _31=null;if(e.ctrlKey||!e._djpage){var k=dojo.keys;switch(e.charOrCode){case k.LEFT_ARROW:case k.UP_ARROW:if(!e._djpage){_31=false;}break;case k.PAGE_UP:if(e.ctrlKey){_31=false;}break;case k.RIGHT_ARROW:case k.DOWN_ARROW:if(!e._djpage){_31=true;}break;case k.PAGE_DOWN:if(e.ctrlKey){_31=true;}break;case k.DELETE:if(this._currentChild.closable){this.onCloseButtonClick(this._currentChild);}dojo.stopEvent(e);break;default:if(e.ctrlKey){if(e.charOrCode===k.TAB){this.adjacent(!e.shiftKey).onClick();dojo.stopEvent(e);}else{if(e.charOrCode=="w"){if(this._currentChild.closable){this.onCloseButtonClick(this._currentChild);}dojo.stopEvent(e);}}}}if(_31!==null){this.adjacent(_31).onClick();dojo.stopEvent(e);}}},onContainerKeyPress:function(_33){_33.e._djpage=_33.page;this.onkeypress(_33.e);}});dojo.declare("dijit.layout._StackButton",dijit.form.ToggleButton,{tabIndex:"-1",postCreate:function(evt){dijit.setWaiRole((this.focusNode||this.domNode),"tab");this.inherited(arguments);},onClick:function(evt){dijit.focus(this.focusNode);},onClickCloseButton:function(evt){evt.stopPropagation();}});dojo.extend(dijit._Widget,{title:"",selected:false,closable:false,onClose:function(){return true;}});} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/layout/TabContainer.js b/spring-js/src/main/resources/META-INF/dijit/layout/TabContainer.js index 11e17d50..86b71623 100644 --- a/spring-js/src/main/resources/META-INF/dijit/layout/TabContainer.js +++ b/spring-js/src/main/resources/META-INF/dijit/layout/TabContainer.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dijit.layout.TabContainer"]){dojo._hasResource["dijit.layout.TabContainer"]=true;dojo.provide("dijit.layout.TabContainer");dojo.require("dijit.layout.StackContainer");dojo.require("dijit._Templated");dojo.declare("dijit.layout.TabContainer",[dijit.layout.StackContainer,dijit._Templated],{tabPosition:"top",templateString:null,templateString:"
\n\t
\n\t
\n
\n",postCreate:function(){dijit.layout.TabContainer.superclass.postCreate.apply(this,arguments);this.tablist=new dijit.layout.TabController({id:this.id+"_tablist",tabPosition:this.tabPosition,doLayout:this.doLayout,containerId:this.id},this.tablistNode);},_setupChild:function(_1){dojo.addClass(_1.domNode,"dijitTabPane");this.inherited("_setupChild",arguments);return _1;},startup:function(){if(this._started){return;}this.tablist.startup();this.inherited("startup",arguments);if(dojo.isSafari){setTimeout(dojo.hitch(this,"layout"),0);}},layout:function(){if(!this.doLayout){return;}var _2=this.tabPosition.replace(/-h/,"");var _3=[{domNode:this.tablist.domNode,layoutAlign:_2},{domNode:this.containerNode,layoutAlign:"client"}];dijit.layout.layoutChildren(this.domNode,this._contentBox,_3);this._containerContentBox=dijit.layout.marginBox2contentBox(this.containerNode,_3[1]);if(this.selectedChildWidget){this._showChild(this.selectedChildWidget);if(this.doLayout&&this.selectedChildWidget.resize){this.selectedChildWidget.resize(this._containerContentBox);}}},destroy:function(){this.tablist.destroy();this.inherited("destroy",arguments);}});dojo.declare("dijit.layout.TabController",dijit.layout.StackController,{templateString:"
",tabPosition:"top",doLayout:true,buttonWidget:"dijit.layout._TabButton",postMixInProperties:function(){this["class"]="dijitTabLabels-"+this.tabPosition+(this.doLayout?"":" dijitTabNoLayout");this.inherited("postMixInProperties",arguments);}});dojo.declare("dijit.layout._TabButton",dijit.layout._StackButton,{baseClass:"dijitTab",templateString:"
\n
\n ${!label}\n \n x\n \n
\n
\n",postCreate:function(){if(this.closeButton){dojo.addClass(this.innerDiv,"dijitClosable");}else{this.closeButtonNode.style.display="none";}this.inherited("postCreate",arguments);dojo.setSelectable(this.containerNode,false);}});} \ No newline at end of file +if(!dojo._hasResource["dijit.layout.TabContainer"]){dojo._hasResource["dijit.layout.TabContainer"]=true;dojo.provide("dijit.layout.TabContainer");dojo.require("dijit.layout.StackContainer");dojo.require("dijit._Templated");dojo.requireLocalization("dijit","common",null,"ar,ca,ROOT,cs,da,de,el,es,fi,fr,he,hu,it,ja,ko,nb,nl,pl,pt,pt-pt,ru,sk,sl,sv,th,tr,zh,zh-tw");dojo.declare("dijit.layout.TabContainer",[dijit.layout.StackContainer,dijit._Templated],{tabPosition:"top",baseClass:"dijitTabContainer",tabStrip:false,templateString:null,templateString:"
\n\t
\n\t
\n\t
\n
\n",_controllerWidget:"dijit.layout.TabController",postMixInProperties:function(){this.baseClass+=this.tabPosition.charAt(0).toUpperCase()+this.tabPosition.substr(1).replace(/-.*/,"");this.inherited(arguments);},postCreate:function(){this.inherited(arguments);var _1=dojo.getObject(this._controllerWidget);this.tablist=new _1({id:this.id+"_tablist",tabPosition:this.tabPosition,doLayout:this.doLayout,containerId:this.id,"class":this.baseClass+"-tabs"+(this.doLayout?"":" dijitTabNoLayout")},this.tablistNode);if(this.tabStrip){dojo.addClass(this.tablist.domNode,this.baseClass+"Strip");}},_setupChild:function(_2){dojo.addClass(_2.domNode,"dijitTabPane");this.inherited(arguments);return _2;},startup:function(){if(this._started){return;}this.tablist.startup();this.inherited(arguments);},layout:function(){if(!this.doLayout){return;}var _3=this.tabPosition.replace(/-h/,"");var _4=[{domNode:this.tablist.domNode,layoutAlign:_3},{domNode:this.tablistSpacer,layoutAlign:_3},{domNode:this.containerNode,layoutAlign:"client"}];dijit.layout.layoutChildren(this.domNode,this._contentBox,_4);this._containerContentBox=dijit.layout.marginBox2contentBox(this.containerNode,_4[2]);if(this.selectedChildWidget){this._showChild(this.selectedChildWidget);if(this.doLayout&&this.selectedChildWidget.resize){this.selectedChildWidget.resize(this._containerContentBox);}}},destroy:function(){if(this.tablist){this.tablist.destroy();}this.inherited(arguments);}});dojo.declare("dijit.layout.TabController",dijit.layout.StackController,{templateString:"
",tabPosition:"top",doLayout:true,buttonWidget:"dijit.layout._TabButton",_rectifyRtlTabList:function(){if(0>=this.tabPosition.indexOf("-h")){return;}if(!this.pane2button){return;}var _5=0;for(var _6 in this.pane2button){var ow=this.pane2button[_6].innerDiv.scrollWidth;_5=Math.max(_5,ow);}for(_6 in this.pane2button){this.pane2button[_6].innerDiv.style.width=_5+"px";}}});dojo.declare("dijit.layout._TabButton",dijit.layout._StackButton,{baseClass:"dijitTab",templateString:"
\n
\n
\n\t ${!label}\n\t
\n\t \t\"\"\n\t x\n\t
\n
\n
\n
\n",postCreate:function(){if(this.closeButton){dojo.addClass(this.innerDiv,"dijitClosable");var _8=dojo.i18n.getLocalization("dijit","common");if(this.closeNode){dojo.attr(this.closeNode,"title",_8.itemClose);dojo.attr(this.closeButtonNode,"title",_8.itemClose);}}else{this.closeNode.style.display="none";}this.inherited(arguments);dojo.setSelectable(this.containerNode,false);}});} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/layout/_LayoutWidget.js b/spring-js/src/main/resources/META-INF/dijit/layout/_LayoutWidget.js index 66b1fb3a..3fcd1f51 100644 --- a/spring-js/src/main/resources/META-INF/dijit/layout/_LayoutWidget.js +++ b/spring-js/src/main/resources/META-INF/dijit/layout/_LayoutWidget.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dijit.layout._LayoutWidget"]){dojo._hasResource["dijit.layout._LayoutWidget"]=true;dojo.provide("dijit.layout._LayoutWidget");dojo.require("dijit._Widget");dojo.require("dijit._Container");dojo.declare("dijit.layout._LayoutWidget",[dijit._Widget,dijit._Container,dijit._Contained],{isLayoutContainer:true,postCreate:function(){dojo.addClass(this.domNode,"dijitContainer");},startup:function(){if(this._started){return;}this._started=true;if(this.getChildren){dojo.forEach(this.getChildren(),function(_1){_1.startup();});}if(!this.getParent||!this.getParent()){this.resize();this.connect(window,"onresize",function(){this.resize();});}},resize:function(_2){var _3=this.domNode;if(_2){dojo.marginBox(_3,_2);if(_2.t){_3.style.top=_2.t+"px";}if(_2.l){_3.style.left=_2.l+"px";}}var mb=dojo.mixin(dojo.marginBox(_3),_2||{});this._contentBox=dijit.layout.marginBox2contentBox(_3,mb);this.layout();},layout:function(){}});dijit.layout.marginBox2contentBox=function(_5,mb){var cs=dojo.getComputedStyle(_5);var me=dojo._getMarginExtents(_5,cs);var pb=dojo._getPadBorderExtents(_5,cs);return {l:dojo._toPixelValue(_5,cs.paddingLeft),t:dojo._toPixelValue(_5,cs.paddingTop),w:mb.w-(me.w+pb.w),h:mb.h-(me.h+pb.h)};};(function(){var _a=function(_b){return _b.substring(0,1).toUpperCase()+_b.substring(1);};var _c=function(_d,_e){_d.resize?_d.resize(_e):dojo.marginBox(_d.domNode,_e);dojo.mixin(_d,dojo.marginBox(_d.domNode));dojo.mixin(_d,_e);};dijit.layout.layoutChildren=function(_f,dim,_11){dim=dojo.mixin({},dim);dojo.addClass(_f,"dijitLayoutContainer");_11=dojo.filter(_11,function(_12){return _12.layoutAlign!="client";}).concat(dojo.filter(_11,function(_13){return _13.layoutAlign=="client";}));dojo.forEach(_11,function(_14){var elm=_14.domNode,pos=_14.layoutAlign;var _17=elm.style;_17.left=dim.l+"px";_17.top=dim.t+"px";_17.bottom=_17.right="auto";dojo.addClass(elm,"dijitAlign"+_a(pos));if(pos=="top"||pos=="bottom"){_c(_14,{w:dim.w});dim.h-=_14.h;if(pos=="top"){dim.t+=_14.h;}else{_17.top=dim.t+dim.h+"px";}}else{if(pos=="left"||pos=="right"){_c(_14,{h:dim.h});dim.w-=_14.w;if(pos=="left"){dim.l+=_14.w;}else{_17.left=dim.l+dim.w+"px";}}else{if(pos=="client"){_c(_14,dim);}}}});};})();} \ No newline at end of file +if(!dojo._hasResource["dijit.layout._LayoutWidget"]){dojo._hasResource["dijit.layout._LayoutWidget"]=true;dojo.provide("dijit.layout._LayoutWidget");dojo.require("dijit._Widget");dojo.require("dijit._Container");dojo.declare("dijit.layout._LayoutWidget",[dijit._Widget,dijit._Container,dijit._Contained],{baseClass:"dijitLayoutContainer",isLayoutContainer:true,postCreate:function(){dojo.addClass(this.domNode,"dijitContainer");dojo.addClass(this.domNode,this.baseClass);},startup:function(){if(this._started){return;}dojo.forEach(this.getChildren(),function(_1){_1.startup();});if(!this.getParent||!this.getParent()){this.resize();this.connect(dojo.global,"onresize","resize");}this.inherited(arguments);},resize:function(_2,_3){var _4=this.domNode;if(_2){dojo.marginBox(_4,_2);if(_2.t){_4.style.top=_2.t+"px";}if(_2.l){_4.style.left=_2.l+"px";}}var mb=_3||{};dojo.mixin(mb,_2||{});if(!("h" in mb)||!("w" in mb)){mb=dojo.mixin(dojo.marginBox(_4),mb);}var cs=dojo.getComputedStyle(_4);var me=dojo._getMarginExtents(_4,cs);var be=dojo._getBorderExtents(_4,cs);var bb=this._borderBox={w:mb.w-(me.w+be.w),h:mb.h-(me.h+be.h)};var pe=dojo._getPadExtents(_4,cs);this._contentBox={l:dojo._toPixelValue(_4,cs.paddingLeft),t:dojo._toPixelValue(_4,cs.paddingTop),w:bb.w-pe.w,h:bb.h-pe.h};this.layout();},layout:function(){},_setupChild:function(_b){if(_b.baseClass){dojo.addClass(_b.domNode,this.baseClass+"-"+_b.baseClass);}},addChild:function(_c,_d){this.inherited(arguments);if(this._started){this._setupChild(_c);}},removeChild:function(_e){if(_e.baseClass){dojo.removeClass(_e.domNode,this.baseClass+"-"+_e.baseClass);}this.inherited(arguments);}});dijit.layout.marginBox2contentBox=function(_f,mb){var cs=dojo.getComputedStyle(_f);var me=dojo._getMarginExtents(_f,cs);var pb=dojo._getPadBorderExtents(_f,cs);return {l:dojo._toPixelValue(_f,cs.paddingLeft),t:dojo._toPixelValue(_f,cs.paddingTop),w:mb.w-(me.w+pb.w),h:mb.h-(me.h+pb.h)};};(function(){var _14=function(_15){return _15.substring(0,1).toUpperCase()+_15.substring(1);};var _16=function(_17,dim){_17.resize?_17.resize(dim):dojo.marginBox(_17.domNode,dim);dojo.mixin(_17,dojo.marginBox(_17.domNode));dojo.mixin(_17,dim);};dijit.layout.layoutChildren=function(_19,dim,_1b){dim=dojo.mixin({},dim);dojo.addClass(_19,"dijitLayoutContainer");_1b=dojo.filter(_1b,function(_1c){return _1c.layoutAlign!="client";}).concat(dojo.filter(_1b,function(_1d){return _1d.layoutAlign=="client";}));dojo.forEach(_1b,function(_1e){var elm=_1e.domNode,pos=_1e.layoutAlign;var _21=elm.style;_21.left=dim.l+"px";_21.top=dim.t+"px";_21.bottom=_21.right="auto";dojo.addClass(elm,"dijitAlign"+_14(pos));if(pos=="top"||pos=="bottom"){_16(_1e,{w:dim.w});dim.h-=_1e.h;if(pos=="top"){dim.t+=_1e.h;}else{_21.top=dim.t+dim.h+"px";}}else{if(pos=="left"||pos=="right"){_16(_1e,{h:dim.h});dim.w-=_1e.w;if(pos=="left"){dim.l+=_1e.w;}else{_21.left=dim.l+dim.w+"px";}}else{if(pos=="client"){_16(_1e,dim);}}}});};})();} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/layout/templates/AccordionPane.html b/spring-js/src/main/resources/META-INF/dijit/layout/templates/AccordionPane.html index 6a10cab2..d9162a2f 100644 --- a/spring-js/src/main/resources/META-INF/dijit/layout/templates/AccordionPane.html +++ b/spring-js/src/main/resources/META-INF/dijit/layout/templates/AccordionPane.html @@ -1,11 +1,11 @@ -
▲
▼
${title}
+-
diff --git a/spring-js/src/main/resources/META-INF/dijit/layout/templates/TabContainer.html b/spring-js/src/main/resources/META-INF/dijit/layout/templates/TabContainer.html index 105e8c6c..c28b4225 100644 --- a/spring-js/src/main/resources/META-INF/dijit/layout/templates/TabContainer.html +++ b/spring-js/src/main/resources/META-INF/dijit/layout/templates/TabContainer.html @@ -1,4 +1,5 @@
-
+
+
diff --git a/spring-js/src/main/resources/META-INF/dijit/layout/templates/_TabButton.html b/spring-js/src/main/resources/META-INF/dijit/layout/templates/_TabButton.html index 982941d9..0d3806ba 100644 --- a/spring-js/src/main/resources/META-INF/dijit/layout/templates/_TabButton.html +++ b/spring-js/src/main/resources/META-INF/dijit/layout/templates/_TabButton.html @@ -1,8 +1,11 @@ -
-
- ${!label} - - x - +
+
+
+ ${!label} +
+ + x +
+
diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/ar/common.js b/spring-js/src/main/resources/META-INF/dijit/nls/ar/common.js new file mode 100644 index 00000000..99af5089 --- /dev/null +++ b/spring-js/src/main/resources/META-INF/dijit/nls/ar/common.js @@ -0,0 +1 @@ +({"buttonOk":"حسنا","buttonCancel":"الغاء","buttonSave":"حفظ","itemClose":"اغلاق"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/ar/loading.js b/spring-js/src/main/resources/META-INF/dijit/nls/ar/loading.js new file mode 100644 index 00000000..a8f7829b --- /dev/null +++ b/spring-js/src/main/resources/META-INF/dijit/nls/ar/loading.js @@ -0,0 +1 @@ +({"loadingState":"جاري التحميل...","errorState":"عفوا، حدث خطأ "}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/ca/common.js b/spring-js/src/main/resources/META-INF/dijit/nls/ca/common.js new file mode 100644 index 00000000..b9cd0650 --- /dev/null +++ b/spring-js/src/main/resources/META-INF/dijit/nls/ca/common.js @@ -0,0 +1 @@ +({"buttonOk":"D'acord","buttonCancel":"Cancel·la","buttonSave":"Desa","itemClose":"Tanca"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/ca/loading.js b/spring-js/src/main/resources/META-INF/dijit/nls/ca/loading.js new file mode 100644 index 00000000..cd368cc5 --- /dev/null +++ b/spring-js/src/main/resources/META-INF/dijit/nls/ca/loading.js @@ -0,0 +1 @@ +({"loadingState":"S'està carregant...","errorState":"Ens sap greu. S'ha produït un error."}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/common.js b/spring-js/src/main/resources/META-INF/dijit/nls/common.js index c33cce9e..6573dcde 100644 --- a/spring-js/src/main/resources/META-INF/dijit/nls/common.js +++ b/spring-js/src/main/resources/META-INF/dijit/nls/common.js @@ -1 +1 @@ -({"buttonCancel": "Cancel", "buttonSave": "Save", "buttonOk": "OK"}) \ No newline at end of file +({"buttonOk":"OK","buttonCancel":"Cancel","buttonSave":"Save","itemClose":"Close"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/cs/common.js b/spring-js/src/main/resources/META-INF/dijit/nls/cs/common.js index a80f422a..83b3682c 100644 --- a/spring-js/src/main/resources/META-INF/dijit/nls/cs/common.js +++ b/spring-js/src/main/resources/META-INF/dijit/nls/cs/common.js @@ -1 +1 @@ -({"buttonCancel": "Storno", "buttonSave": "Uložit", "buttonOk": "OK"}) \ No newline at end of file +({"buttonOk":"OK","buttonCancel":"Storno","buttonSave":"Uložit","itemClose":"Zavřít"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/cs/loading.js b/spring-js/src/main/resources/META-INF/dijit/nls/cs/loading.js index ad03fbb8..c611926e 100644 --- a/spring-js/src/main/resources/META-INF/dijit/nls/cs/loading.js +++ b/spring-js/src/main/resources/META-INF/dijit/nls/cs/loading.js @@ -1 +1 @@ -({"loadingState": "Probíhá načítání...", "errorState": "Omlouváme se, došlo k chybě"}) \ No newline at end of file +({"loadingState":"Probíhá načítání...","errorState":"Omlouváme se, došlo k chybě"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/da/common.js b/spring-js/src/main/resources/META-INF/dijit/nls/da/common.js new file mode 100644 index 00000000..8c51ed8c --- /dev/null +++ b/spring-js/src/main/resources/META-INF/dijit/nls/da/common.js @@ -0,0 +1 @@ +({"buttonOk":"OK","buttonCancel":"Annullér","buttonSave":"Gem","itemClose":"Luk"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/da/loading.js b/spring-js/src/main/resources/META-INF/dijit/nls/da/loading.js new file mode 100644 index 00000000..5088eaf5 --- /dev/null +++ b/spring-js/src/main/resources/META-INF/dijit/nls/da/loading.js @@ -0,0 +1 @@ +({"loadingState":"Indlæser...","errorState":"Der er opstået en fejl"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/de/common.js b/spring-js/src/main/resources/META-INF/dijit/nls/de/common.js index b1a7667e..cd60c45d 100644 --- a/spring-js/src/main/resources/META-INF/dijit/nls/de/common.js +++ b/spring-js/src/main/resources/META-INF/dijit/nls/de/common.js @@ -1 +1 @@ -({"buttonCancel": "Abbrechen", "buttonSave": "Speichern", "buttonOk": "OK"}) \ No newline at end of file +({"buttonOk":"OK","buttonCancel":"Abbrechen","buttonSave":"Speichern","itemClose":"Schließen"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/de/loading.js b/spring-js/src/main/resources/META-INF/dijit/nls/de/loading.js index 31a36305..4989983d 100644 --- a/spring-js/src/main/resources/META-INF/dijit/nls/de/loading.js +++ b/spring-js/src/main/resources/META-INF/dijit/nls/de/loading.js @@ -1 +1 @@ -({"loadingState": "Wird geladen...", "errorState": "Es ist ein Fehler aufgetreten."}) \ No newline at end of file +({"loadingState":"Wird geladen...","errorState":"Es ist ein Fehler aufgetreten."}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/el/common.js b/spring-js/src/main/resources/META-INF/dijit/nls/el/common.js new file mode 100644 index 00000000..5edd7e5e --- /dev/null +++ b/spring-js/src/main/resources/META-INF/dijit/nls/el/common.js @@ -0,0 +1 @@ +({"buttonOk":"OK","buttonCancel":"Ακύρωση","buttonSave":"Αποθήκευση","itemClose":"Κλείσιμο"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/el/loading.js b/spring-js/src/main/resources/META-INF/dijit/nls/el/loading.js new file mode 100644 index 00000000..9567b3ce --- /dev/null +++ b/spring-js/src/main/resources/META-INF/dijit/nls/el/loading.js @@ -0,0 +1 @@ +({"loadingState":"Φόρτωση...","errorState":"Σας ζητούμε συγνώμη, παρουσιάστηκε σφάλμα"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/es/common.js b/spring-js/src/main/resources/META-INF/dijit/nls/es/common.js index 3bc20e0b..b4feef98 100644 --- a/spring-js/src/main/resources/META-INF/dijit/nls/es/common.js +++ b/spring-js/src/main/resources/META-INF/dijit/nls/es/common.js @@ -1 +1 @@ -({"buttonCancel": "Cancelar", "buttonSave": "Guardar", "buttonOk": "Aceptar"}) \ No newline at end of file +({"buttonOk":"Aceptar","buttonCancel":"Cancelar","buttonSave":"Guardar","itemClose":"Cerrar"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/es/loading.js b/spring-js/src/main/resources/META-INF/dijit/nls/es/loading.js index e84982f3..dc969a3b 100644 --- a/spring-js/src/main/resources/META-INF/dijit/nls/es/loading.js +++ b/spring-js/src/main/resources/META-INF/dijit/nls/es/loading.js @@ -1 +1 @@ -({"loadingState": "Cargando...", "errorState": "Lo siento, se ha producido un error"}) \ No newline at end of file +({"loadingState":"Cargando...","errorState":"Lo siento, se ha producido un error"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/fi/common.js b/spring-js/src/main/resources/META-INF/dijit/nls/fi/common.js new file mode 100644 index 00000000..8b2fc267 --- /dev/null +++ b/spring-js/src/main/resources/META-INF/dijit/nls/fi/common.js @@ -0,0 +1 @@ +({"buttonOk":"OK","buttonCancel":"Peruuta","buttonSave":"Tallenna","itemClose":"Sulje"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/fi/loading.js b/spring-js/src/main/resources/META-INF/dijit/nls/fi/loading.js new file mode 100644 index 00000000..73e10a14 --- /dev/null +++ b/spring-js/src/main/resources/META-INF/dijit/nls/fi/loading.js @@ -0,0 +1 @@ +({"loadingState":"Lataus on meneillään...","errorState":"On ilmennyt virhe."}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/fr/common.js b/spring-js/src/main/resources/META-INF/dijit/nls/fr/common.js index 58c4406c..9f6aabe4 100644 --- a/spring-js/src/main/resources/META-INF/dijit/nls/fr/common.js +++ b/spring-js/src/main/resources/META-INF/dijit/nls/fr/common.js @@ -1 +1 @@ -({"buttonCancel": "Annuler", "buttonSave": "Sauvegarder", "buttonOk": "OK"}) \ No newline at end of file +({"buttonOk":"OK","buttonCancel":"Annuler","buttonSave":"Sauvegarder","itemClose":"Fermer"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/fr/loading.js b/spring-js/src/main/resources/META-INF/dijit/nls/fr/loading.js index 1734d409..ec7192ba 100644 --- a/spring-js/src/main/resources/META-INF/dijit/nls/fr/loading.js +++ b/spring-js/src/main/resources/META-INF/dijit/nls/fr/loading.js @@ -1 +1 @@ -({"loadingState": "Chargement...", "errorState": "Une erreur est survenue"}) \ No newline at end of file +({"loadingState":"Chargement...","errorState":"Une erreur est survenue"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/he/common.js b/spring-js/src/main/resources/META-INF/dijit/nls/he/common.js new file mode 100644 index 00000000..b04d1cc3 --- /dev/null +++ b/spring-js/src/main/resources/META-INF/dijit/nls/he/common.js @@ -0,0 +1 @@ +({"buttonOk":"אישור","buttonCancel":"ביטול","buttonSave":"שמירה","itemClose":"סגירה"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/he/loading.js b/spring-js/src/main/resources/META-INF/dijit/nls/he/loading.js new file mode 100644 index 00000000..bc9801e8 --- /dev/null +++ b/spring-js/src/main/resources/META-INF/dijit/nls/he/loading.js @@ -0,0 +1 @@ +({"loadingState":"טעינה...","errorState":"אירעה שגיאה"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/hu/common.js b/spring-js/src/main/resources/META-INF/dijit/nls/hu/common.js index eff77f6e..21a773f4 100644 --- a/spring-js/src/main/resources/META-INF/dijit/nls/hu/common.js +++ b/spring-js/src/main/resources/META-INF/dijit/nls/hu/common.js @@ -1 +1 @@ -({"buttonCancel": "Mégse", "buttonSave": "Mentés", "buttonOk": "OK"}) \ No newline at end of file +({"buttonOk":"OK","buttonCancel":"Mégse","buttonSave":"Mentés","itemClose":"Bezárás"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/hu/loading.js b/spring-js/src/main/resources/META-INF/dijit/nls/hu/loading.js index 62db1774..d61e9a2a 100644 --- a/spring-js/src/main/resources/META-INF/dijit/nls/hu/loading.js +++ b/spring-js/src/main/resources/META-INF/dijit/nls/hu/loading.js @@ -1 +1 @@ -({"loadingState": "Betöltés...", "errorState": "Sajnálom, hiba történt"}) \ No newline at end of file +({"loadingState":"Betöltés...","errorState":"Sajnálom, hiba történt"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/it/common.js b/spring-js/src/main/resources/META-INF/dijit/nls/it/common.js index 12fb5269..6b3dc74e 100644 --- a/spring-js/src/main/resources/META-INF/dijit/nls/it/common.js +++ b/spring-js/src/main/resources/META-INF/dijit/nls/it/common.js @@ -1 +1 @@ -({"buttonCancel": "Annulla", "buttonSave": "Salva", "buttonOk": "OK"}) \ No newline at end of file +({"buttonOk":"OK","buttonCancel":"Annulla","buttonSave":"Salva","itemClose":"Chiudi"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/it/loading.js b/spring-js/src/main/resources/META-INF/dijit/nls/it/loading.js index dad6de99..60d05e00 100644 --- a/spring-js/src/main/resources/META-INF/dijit/nls/it/loading.js +++ b/spring-js/src/main/resources/META-INF/dijit/nls/it/loading.js @@ -1 +1 @@ -({"loadingState": "Caricamento in corso...", "errorState": "Si è verificato un errore"}) \ No newline at end of file +({"loadingState":"Caricamento in corso...","errorState":"Si è verificato un errore"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/ja/common.js b/spring-js/src/main/resources/META-INF/dijit/nls/ja/common.js index 01acdd2d..b0b48c61 100644 --- a/spring-js/src/main/resources/META-INF/dijit/nls/ja/common.js +++ b/spring-js/src/main/resources/META-INF/dijit/nls/ja/common.js @@ -1 +1 @@ -({"buttonCancel": "キャンセル", "buttonSave": "保存", "buttonOk": "OK"}) \ No newline at end of file +({"buttonOk":"OK","buttonCancel":"キャンセル","buttonSave":"保存","itemClose":"閉じる"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/ja/loading.js b/spring-js/src/main/resources/META-INF/dijit/nls/ja/loading.js index 867d046d..fa67d67c 100644 --- a/spring-js/src/main/resources/META-INF/dijit/nls/ja/loading.js +++ b/spring-js/src/main/resources/META-INF/dijit/nls/ja/loading.js @@ -1 +1 @@ -({"loadingState": "ロード中...", "errorState": "エラーが発生しました。"}) \ No newline at end of file +({"loadingState":"ロード中...","errorState":"エラーが発生しました。"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/ko/common.js b/spring-js/src/main/resources/META-INF/dijit/nls/ko/common.js index 22925e36..8e12bbff 100644 --- a/spring-js/src/main/resources/META-INF/dijit/nls/ko/common.js +++ b/spring-js/src/main/resources/META-INF/dijit/nls/ko/common.js @@ -1 +1 @@ -({"buttonCancel": "취소", "buttonSave": "저장", "buttonOk": "확인"}) \ No newline at end of file +({"buttonOk":"확인","buttonCancel":"취소","buttonSave":"저장","itemClose":"닫기"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/ko/loading.js b/spring-js/src/main/resources/META-INF/dijit/nls/ko/loading.js index d615544e..5d1ca128 100644 --- a/spring-js/src/main/resources/META-INF/dijit/nls/ko/loading.js +++ b/spring-js/src/main/resources/META-INF/dijit/nls/ko/loading.js @@ -1 +1 @@ -({"loadingState": "로드 중...", "errorState": "죄송합니다. 오류가 발생했습니다."}) \ No newline at end of file +({"loadingState":"로드 중...","errorState":"죄송합니다. 오류가 발생했습니다."}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/loading.js b/spring-js/src/main/resources/META-INF/dijit/nls/loading.js index 94d06f82..1d6fa9b7 100644 --- a/spring-js/src/main/resources/META-INF/dijit/nls/loading.js +++ b/spring-js/src/main/resources/META-INF/dijit/nls/loading.js @@ -1 +1 @@ -({"loadingState": "Loading...", "errorState": "Sorry, an error occurred"}) \ No newline at end of file +({"loadingState":"Loading...","errorState":"Sorry, an error occurred"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/nb/common.js b/spring-js/src/main/resources/META-INF/dijit/nls/nb/common.js new file mode 100644 index 00000000..73e38c78 --- /dev/null +++ b/spring-js/src/main/resources/META-INF/dijit/nls/nb/common.js @@ -0,0 +1 @@ +({"buttonOk":"OK","buttonCancel":"Avbryt","buttonSave":"Lagre","itemClose":"Lukk"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/nb/loading.js b/spring-js/src/main/resources/META-INF/dijit/nls/nb/loading.js new file mode 100644 index 00000000..dbc314df --- /dev/null +++ b/spring-js/src/main/resources/META-INF/dijit/nls/nb/loading.js @@ -0,0 +1 @@ +({"loadingState":"Laster inn...","errorState":"Det oppsto en feil"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/nl/common.js b/spring-js/src/main/resources/META-INF/dijit/nls/nl/common.js new file mode 100644 index 00000000..fa4c66e7 --- /dev/null +++ b/spring-js/src/main/resources/META-INF/dijit/nls/nl/common.js @@ -0,0 +1 @@ +({"buttonOk":"OK","buttonCancel":"Annuleren","buttonSave":"Opslaan","itemClose":"Sluiten"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/nl/loading.js b/spring-js/src/main/resources/META-INF/dijit/nls/nl/loading.js new file mode 100644 index 00000000..c9870fd5 --- /dev/null +++ b/spring-js/src/main/resources/META-INF/dijit/nls/nl/loading.js @@ -0,0 +1 @@ +({"loadingState":"Bezig met laden...","errorState":"Er is een fout opgetreden"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/pl/common.js b/spring-js/src/main/resources/META-INF/dijit/nls/pl/common.js index 1c3b98c1..c84e5390 100644 --- a/spring-js/src/main/resources/META-INF/dijit/nls/pl/common.js +++ b/spring-js/src/main/resources/META-INF/dijit/nls/pl/common.js @@ -1 +1 @@ -({"buttonCancel": "Anuluj", "buttonSave": "Zapisz", "buttonOk": "OK"}) \ No newline at end of file +({"buttonOk":"OK","buttonCancel":"Anuluj","buttonSave":"Zapisz","itemClose":"Zamknij"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/pl/loading.js b/spring-js/src/main/resources/META-INF/dijit/nls/pl/loading.js index e87bc3d1..eab34766 100644 --- a/spring-js/src/main/resources/META-INF/dijit/nls/pl/loading.js +++ b/spring-js/src/main/resources/META-INF/dijit/nls/pl/loading.js @@ -1 +1 @@ -({"loadingState": "Trwa ładowanie...", "errorState": "Niestety, wystąpił błąd"}) \ No newline at end of file +({"loadingState":"Trwa ładowanie...","errorState":"Niestety, wystąpił błąd"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/pt-pt/common.js b/spring-js/src/main/resources/META-INF/dijit/nls/pt-pt/common.js new file mode 100644 index 00000000..79927051 --- /dev/null +++ b/spring-js/src/main/resources/META-INF/dijit/nls/pt-pt/common.js @@ -0,0 +1 @@ +({"buttonOk":"OK","buttonCancel":"Cancelar","buttonSave":"Guardar","itemClose":"Fechar"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/pt-pt/loading.js b/spring-js/src/main/resources/META-INF/dijit/nls/pt-pt/loading.js new file mode 100644 index 00000000..80257d37 --- /dev/null +++ b/spring-js/src/main/resources/META-INF/dijit/nls/pt-pt/loading.js @@ -0,0 +1 @@ +({"loadingState":"A carregar...","errorState":"Lamentamos, mas ocorreu um erro"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/pt/common.js b/spring-js/src/main/resources/META-INF/dijit/nls/pt/common.js index 30ae79b5..b94e6bc5 100644 --- a/spring-js/src/main/resources/META-INF/dijit/nls/pt/common.js +++ b/spring-js/src/main/resources/META-INF/dijit/nls/pt/common.js @@ -1 +1 @@ -({"buttonCancel": "Cancelar ", "buttonSave": "Salvar", "buttonOk": "OK"}) \ No newline at end of file +({"buttonOk":"OK","buttonCancel":"Cancelar","buttonSave":"Salvar","itemClose":"Fechar"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/pt/loading.js b/spring-js/src/main/resources/META-INF/dijit/nls/pt/loading.js index ed6a4331..bf7057a2 100644 --- a/spring-js/src/main/resources/META-INF/dijit/nls/pt/loading.js +++ b/spring-js/src/main/resources/META-INF/dijit/nls/pt/loading.js @@ -1 +1 @@ -({"loadingState": "Carregando...", "errorState": "Ocorreu um erro"}) \ No newline at end of file +({"loadingState":"Carregando...","errorState":"Ocorreu um erro"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/ru/common.js b/spring-js/src/main/resources/META-INF/dijit/nls/ru/common.js index a24049ec..9a76d095 100644 --- a/spring-js/src/main/resources/META-INF/dijit/nls/ru/common.js +++ b/spring-js/src/main/resources/META-INF/dijit/nls/ru/common.js @@ -1 +1 @@ -({"buttonCancel": "Отмена", "buttonSave": "Сохранить", "buttonOk": "ОК"}) \ No newline at end of file +({"buttonOk":"ОК","buttonCancel":"Отмена","buttonSave":"Сохранить","itemClose":"Закрыть"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/ru/loading.js b/spring-js/src/main/resources/META-INF/dijit/nls/ru/loading.js index 0c728b7c..55cd03b6 100644 --- a/spring-js/src/main/resources/META-INF/dijit/nls/ru/loading.js +++ b/spring-js/src/main/resources/META-INF/dijit/nls/ru/loading.js @@ -1 +1 @@ -({"loadingState": "Загрузка...", "errorState": "Извините, возникла ошибка"}) \ No newline at end of file +({"loadingState":"Загрузка...","errorState":"Извините, возникла ошибка"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/sk/common.js b/spring-js/src/main/resources/META-INF/dijit/nls/sk/common.js new file mode 100644 index 00000000..59a12d11 --- /dev/null +++ b/spring-js/src/main/resources/META-INF/dijit/nls/sk/common.js @@ -0,0 +1 @@ +({"buttonOk":"OK","buttonCancel":"Zrušiť","buttonSave":"Uložiť","itemClose":"Zatvoriť"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/sk/loading.js b/spring-js/src/main/resources/META-INF/dijit/nls/sk/loading.js new file mode 100644 index 00000000..e805bd80 --- /dev/null +++ b/spring-js/src/main/resources/META-INF/dijit/nls/sk/loading.js @@ -0,0 +1 @@ +({"loadingState":"Zavádzanie...","errorState":"Nastala chyba"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/sl/common.js b/spring-js/src/main/resources/META-INF/dijit/nls/sl/common.js new file mode 100644 index 00000000..4704cc51 --- /dev/null +++ b/spring-js/src/main/resources/META-INF/dijit/nls/sl/common.js @@ -0,0 +1 @@ +({"buttonOk":"V redu","buttonCancel":"Prekliči","buttonSave":"Shrani","itemClose":"Zapri"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/sl/loading.js b/spring-js/src/main/resources/META-INF/dijit/nls/sl/loading.js new file mode 100644 index 00000000..4100866d --- /dev/null +++ b/spring-js/src/main/resources/META-INF/dijit/nls/sl/loading.js @@ -0,0 +1 @@ +({"loadingState":"Nalaganje...","errorState":"Oprostite, prišlo je do napake."}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/sv/common.js b/spring-js/src/main/resources/META-INF/dijit/nls/sv/common.js index ac3d254b..cd3444f4 100644 --- a/spring-js/src/main/resources/META-INF/dijit/nls/sv/common.js +++ b/spring-js/src/main/resources/META-INF/dijit/nls/sv/common.js @@ -1 +1 @@ -({"buttonCancel":"Avbryt","buttonSave":"Spara","buttonOk":"OK","itemClose":"Close"}) \ No newline at end of file +({"buttonOk":"OK","buttonCancel":"Avbryt","buttonSave":"Spara","itemClose":"Stäng"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/sv/loading.js b/spring-js/src/main/resources/META-INF/dijit/nls/sv/loading.js index 8f33424c..95b90d26 100644 --- a/spring-js/src/main/resources/META-INF/dijit/nls/sv/loading.js +++ b/spring-js/src/main/resources/META-INF/dijit/nls/sv/loading.js @@ -1 +1 @@ -({"loadingState":"Laddar...","errorState":"Ett fel har uppstått."}) \ No newline at end of file +({"loadingState":"Läser in...","errorState":"Det uppstod ett fel."}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/th/common.js b/spring-js/src/main/resources/META-INF/dijit/nls/th/common.js new file mode 100644 index 00000000..be06dd04 --- /dev/null +++ b/spring-js/src/main/resources/META-INF/dijit/nls/th/common.js @@ -0,0 +1 @@ +({"buttonOk":"ตกลง","buttonCancel":"ยกเลิก","buttonSave":"บันทึก","itemClose":"ปิด"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/th/loading.js b/spring-js/src/main/resources/META-INF/dijit/nls/th/loading.js new file mode 100644 index 00000000..bb6b75d3 --- /dev/null +++ b/spring-js/src/main/resources/META-INF/dijit/nls/th/loading.js @@ -0,0 +1 @@ +({"loadingState":"กำลังโหลด...","errorState":"ขออภัย เกิดข้อผิดพลาด"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/tr/common.js b/spring-js/src/main/resources/META-INF/dijit/nls/tr/common.js new file mode 100644 index 00000000..e89e645e --- /dev/null +++ b/spring-js/src/main/resources/META-INF/dijit/nls/tr/common.js @@ -0,0 +1 @@ +({"buttonOk":"Tamam","buttonCancel":"İptal","buttonSave":"Kaydet","itemClose":"Kapat"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/tr/loading.js b/spring-js/src/main/resources/META-INF/dijit/nls/tr/loading.js new file mode 100644 index 00000000..b0ed738a --- /dev/null +++ b/spring-js/src/main/resources/META-INF/dijit/nls/tr/loading.js @@ -0,0 +1 @@ +({"loadingState":"Yükleniyor...","errorState":"Üzgünüz, bir hata oluştu"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/zh-tw/common.js b/spring-js/src/main/resources/META-INF/dijit/nls/zh-tw/common.js index ee573e2d..5d3fee06 100644 --- a/spring-js/src/main/resources/META-INF/dijit/nls/zh-tw/common.js +++ b/spring-js/src/main/resources/META-INF/dijit/nls/zh-tw/common.js @@ -1 +1 @@ -({"buttonCancel": "取消", "buttonSave": "儲存", "buttonOk": "確定"}) \ No newline at end of file +({"buttonOk":"確定","buttonCancel":"取消","buttonSave":"儲存","itemClose":"關閉"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/zh-tw/loading.js b/spring-js/src/main/resources/META-INF/dijit/nls/zh-tw/loading.js index e0a1738a..00785410 100644 --- a/spring-js/src/main/resources/META-INF/dijit/nls/zh-tw/loading.js +++ b/spring-js/src/main/resources/META-INF/dijit/nls/zh-tw/loading.js @@ -1 +1 @@ -({"loadingState": "載入中...", "errorState": "抱歉，發生錯誤"}) \ No newline at end of file +({"loadingState":"載入中...","errorState":"抱歉，發生錯誤"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/zh/common.js b/spring-js/src/main/resources/META-INF/dijit/nls/zh/common.js index 8ef48a95..0bb6267e 100644 --- a/spring-js/src/main/resources/META-INF/dijit/nls/zh/common.js +++ b/spring-js/src/main/resources/META-INF/dijit/nls/zh/common.js @@ -1 +1 @@ -({"buttonCancel": "取消", "buttonSave": "保存", "buttonOk": "确定"}) \ No newline at end of file +({"buttonOk":"确定","buttonCancel":"取消","buttonSave":"保存","itemClose":"关闭"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/nls/zh/loading.js b/spring-js/src/main/resources/META-INF/dijit/nls/zh/loading.js index 82946561..f68b8fa2 100644 --- a/spring-js/src/main/resources/META-INF/dijit/nls/zh/loading.js +++ b/spring-js/src/main/resources/META-INF/dijit/nls/zh/loading.js @@ -1 +1 @@ -({"loadingState": "正在装入...", "errorState": "对不起，发生了错误"}) \ No newline at end of file +({"loadingState":"正在装入...","errorState":"对不起，发生了错误"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/resources/_modules.js b/spring-js/src/main/resources/META-INF/dijit/resources/_modules.js index 03dd5390..9490cbca 100644 --- a/spring-js/src/main/resources/META-INF/dijit/resources/_modules.js +++ b/spring-js/src/main/resources/META-INF/dijit/resources/_modules.js @@ -1,11 +1,7 @@ /* - Copyright (c) 2004-2008, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ diff --git a/spring-js/src/main/resources/META-INF/dijit/robot.js b/spring-js/src/main/resources/META-INF/dijit/robot.js new file mode 100644 index 00000000..09373cf5 --- /dev/null +++ b/spring-js/src/main/resources/META-INF/dijit/robot.js @@ -0,0 +1,8 @@ +/* + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details +*/ + + +if(!dojo._hasResource["dijit.robot"]){dojo._hasResource["dijit.robot"]=true;dojo.provide("dijit.robot");dojo.require("dojo.robot");dojo.require("dijit._base.scroll");dojo.mixin(doh.robot,{_scrollIntoView:function(_1){if(typeof _1=="function"){_1=_1();}dijit.scrollIntoView(_1);}});} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/robotx.js b/spring-js/src/main/resources/META-INF/dijit/robotx.js new file mode 100644 index 00000000..ccc4710e --- /dev/null +++ b/spring-js/src/main/resources/META-INF/dijit/robotx.js @@ -0,0 +1,8 @@ +/* + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details +*/ + + +if(!dojo._hasResource["dijit.robotx"]){dojo._hasResource["dijit.robotx"]=true;dojo.provide("dijit.robotx");dojo.require("dijit.robot");dojo.require("dojo.robotx");dojo.experimental("dijit.robotx");(function(){var _1=doh.robot._updateDocument;dojo.mixin(doh.robot,{_updateDocument:function(){_1();var _2=(dojo.doc.parentWindow||dojo.doc.defaultView);if(_2["dijit"]){dijit.registry=_2.dijit.registry;}}});})();} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/templates/Calendar.html b/spring-js/src/main/resources/META-INF/dijit/templates/Calendar.html index 68c1496f..cf439efc 100644 --- a/spring-js/src/main/resources/META-INF/dijit/templates/Calendar.html +++ b/spring-js/src/main/resources/META-INF/dijit/templates/Calendar.html @@ -2,11 +2,11 @@
- + diff --git a/spring-js/src/main/resources/META-INF/dijit/templates/ColorPalette.html b/spring-js/src/main/resources/META-INF/dijit/templates/ColorPalette.html index 86f59348..e4557c76 100644 --- a/spring-js/src/main/resources/META-INF/dijit/templates/ColorPalette.html +++ b/spring-js/src/main/resources/META-INF/dijit/templates/ColorPalette.html @@ -1,5 +1,5 @@
-
+
diff --git a/spring-js/src/main/resources/META-INF/dijit/templates/Dialog.html b/spring-js/src/main/resources/META-INF/dijit/templates/Dialog.html index 4e09861f..26357cdd 100644 --- a/spring-js/src/main/resources/META-INF/dijit/templates/Dialog.html +++ b/spring-js/src/main/resources/META-INF/dijit/templates/Dialog.html @@ -1,10 +1,9 @@ -
-
- ${title} - - x +
+
+ + + x
-
diff --git a/spring-js/src/main/resources/META-INF/dijit/templates/InlineEditBox.html b/spring-js/src/main/resources/META-INF/dijit/templates/InlineEditBox.html index 7a5b5620..dda8df44 100644 --- a/spring-js/src/main/resources/META-INF/dijit/templates/InlineEditBox.html +++ b/spring-js/src/main/resources/META-INF/dijit/templates/InlineEditBox.html @@ -1,8 +1,8 @@ - +> diff --git a/spring-js/src/main/resources/META-INF/dijit/templates/TimePicker.html b/spring-js/src/main/resources/META-INF/dijit/templates/TimePicker.html new file mode 100644 index 00000000..bcf1054b --- /dev/null +++ b/spring-js/src/main/resources/META-INF/dijit/templates/TimePicker.html @@ -0,0 +1,9 @@ +
▲
▼
diff --git a/spring-js/src/main/resources/META-INF/dijit/templates/TitlePane.html b/spring-js/src/main/resources/META-INF/dijit/templates/TitlePane.html index 64fd0e01..172757f9 100644 --- a/spring-js/src/main/resources/META-INF/dijit/templates/TitlePane.html +++ b/spring-js/src/main/resources/META-INF/dijit/templates/TitlePane.html @@ -1,8 +1,9 @@ -
+
-
-
+ waiRole="button" class="dijitTitlePaneTitle" dojoAttachPoint="titleBarNode,focusNode"> +
diff --git a/spring-js/src/main/resources/META-INF/dijit/templates/TooltipDialog.html b/spring-js/src/main/resources/META-INF/dijit/templates/TooltipDialog.html new file mode 100644 index 00000000..d8cbaee1 --- /dev/null +++ b/spring-js/src/main/resources/META-INF/dijit/templates/TooltipDialog.html @@ -0,0 +1,6 @@ +
+
+
+
+
+
diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/a11y/colors3x4.png b/spring-js/src/main/resources/META-INF/dijit/themes/a11y/colors3x4.png new file mode 100644 index 00000000..e4078812 Binary files /dev/null and b/spring-js/src/main/resources/META-INF/dijit/themes/a11y/colors3x4.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/a11y/colors7x10.png b/spring-js/src/main/resources/META-INF/dijit/themes/a11y/colors7x10.png new file mode 100644 index 00000000..77d22ce3 Binary files /dev/null and b/spring-js/src/main/resources/META-INF/dijit/themes/a11y/colors7x10.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/dijit.css b/spring-js/src/main/resources/META-INF/dijit/themes/dijit.css index a247b67f..6f0b69b7 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/dijit.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/dijit.css @@ -5,51 +5,62 @@ -/**** - GENERIC PIECES +/**** + GENERIC PIECES ****/ .dijitReset { /* Use this style to null out padding, margin, border in your template elements so that page specific styles don't break them. - Use in all TABLE, TR and TD tags. - - If there is more than one class on the tag, place this first so other classes override. */ - margin:0px; - border:0px; - padding:0px; + margin:0; + border:0; + padding:0; line-height:normal; + font: inherit; + color: inherit; } .dijitInline { /* To inline block elements. - Similar to InlineBox below, but this has fewer side-effects in Moz. + Similar to InlineBox below, but this has fewer side-effects in Moz. Also, apparently works on a DIV as well as a FIELDSET. */ display:-moz-inline-box; /* FF2 */ display:inline-block; /* webkit and FF3 */ - border:0px; - padding:0px; + #zoom: 1; /* set hasLayout:true to mimic inline-block */ + #display:inline; /* don't use .dj_ie since that increases the priority */ + border:0; + padding:0; vertical-align:middle; + #vertical-align: auto; /* makes TextBox,Button line up w/native counterparts on IE6 */ } -.dj_ie .dijitInline { - zoom: 1; /* set hasLayout:true to mimic inline-block */ - #display:inline; +.dj_ie INPUT.dijitTextBox, +.dj_ie .dijitInputField INPUT { + font-size: 100%; +} + +.dj_ie .dijitInputField INPUT { /* try to get rid of IE implicit margin around INPUT */ + margin: -1px 0 !important; +} +.dj_iequirks .dijitInputField INPUT { /* try to get rid of IE implicit margin around INPUT */ + margin-top: -3px !important; } .dijitInlineTable { /* To inline tables with a given width set (otherwise, use dijitInline above) * Must also put style="-moz-inline-stack" on the node itself to workaround FF2 bugs */ - display: -moz-inline-stack; /* FF2 */ + display: -moz-inline-stack; /* FF2 */ display:inline-table; - display:inline-block; /* webkit and FF3 */ - #display:inline; /* MSIE (TODO: is this needed???) */ - border:0px; - padding:0px; - vertical-align:middle; - position:relative; /* #5034 */ + display:inline-block; /* webkit and FF3 */ + #zoom: 1; /* set hasLayout:true to mimic inline-block */ + #display:inline; /* don't use .dj_ie since that increases the priority */ + box-sizing: content-box; -moz-box-sizing: content-box; + border:0; + padding:0; } .dijitTeeny { @@ -72,23 +83,18 @@ .dijit_ally .dijitPopup div, .dijit_a11y .dijitPopup table, .dijit_a11y .dijitTooltipContainer { - opacity: 1 !important; background-color: white !important; } -.dj_ie .dijit_a11y .dijitPopup * { - filter: none; -} .dijitInputField { - font-family:inherit; - font-size:inherit; - font-weight:inherit; + overflow:hidden; + #zoom:1; } .dijitPositionOnly { /* Null out all position-related properties */ - padding: 0px !important; - border: 0px !important; + padding: 0 !important; + border: 0 !important; background-color: transparent !important; background-image: none !important; height: auto !important; @@ -99,7 +105,7 @@ /* Null position-related properties */ float: none !important; position: static !important; - margin: 0px 0px 0px 0px !important; + margin: 0 0 0 0 !important; vertical-align: middle !important; } @@ -109,8 +115,8 @@ * being transparent */ position: absolute; - left: 0px; - top: 0px; + left: 0; + top: 0; width: 100%; height: 100%; z-index: -1; @@ -120,8 +126,9 @@ } .dijitClickableRegion { - /* a region we expect the user to click on */ - cursor : pointer; + /* An InlineEditBox in view mode (click this to edit the text) */ + background-color: #e2ebf2; + cursor: text; } @@ -135,56 +142,42 @@ overflow: hidden; /* need on IE so something can be reduced in size, and so scrollbars aren't temporarily displayed when resizing */ } -/**** - A11Y +/**** + A11Y ****/ .dijit_a11y * { background-image:none !important; - background-color:transparent !important; } -.dijit_a11y .dijitCalendarIncrementControl .dijitA11ySideArrow { - padding-left:.2em; - visibility:visible !important; +.dijit_a11y .dijitCalendarIncrementControl .dijitA11ySideArrow { + padding-left:.2em; + visibility:visible !important; +} +.dj_ie6 .dijit_a11y .dijitCalendarIncrementControl { + font-size:.75em !important; } -.dijitToolbar .dijitDropDownButton .dijitA11yDownArrow{ - /*make the arrow smaller in toolbar*/ - padding:0; - margin:0; -} -.dj_ie6 .dijitToolbar .dijitDropDownButton .dijitA11yDownArrow{ - /*vertical-align: middle does not place the arrow in the middle of the toolbar in IE*/ - vertical-align: bottom; +.dijit_a11y .dijitCalendarSelectedDate { + text-decoration:overline !important; } .dijitA11ySideArrow { vertical-align:top; - margin-right:0em; - margin-left:.2em; + margin-right:0em; + margin-left:.2em; line-height:2em; - text-align:center; + text-align:center; } -.dj_ie .dijitA11yDownArrow, -.dj_ie .dijitA11yUpArrow { - font-size:.8em; - vertical-align:middle; - margin-right:.5em; -} - - - - -.dijit_a11y .dijitButton .dijitButtonNode, -.dijit_a11y .dijitDropDownButton .dijitButtonNode, -.dijit_a11y .dijitComboButton .dijitButtonNode, -.dijit_a11y .dijitComboBox .dijitInputField, -.dijit_a11y .dijitComboBox .dijitButtonNode { - border:1px solid black !important; +.dijit_a11y .dijit * { background:white !important; color:black !important; } +.dijit_a11y .dijitButtonNode { + border-color: black!important; + border-style: outset!important; + border-width: medium!important; +} .dijit_a11y .dijitButtonDisabled .dijitButtonNode, .dijit_a11y .dijitDropDownButtonDisabled .dijitButtonNode, @@ -193,24 +186,41 @@ .dijit_a11y .dijitComboBoxDisabled .dijitButtonNode, .dijit_a11y .dijitSpinnerDisabled .dijitButtonNode, .dijit_a11y .dijitSpinnerDisabled .dijitInputField { - border:1px dotted #999999 !important; - color:#999999 !important; + border-style: outset!important; + border-width: medium!important; + border-color: #999 !important; + color:#999 !important; } -.dijit_a11y .dijitComboButton .dijitDownArrowButton, -.dijit_a11y .dijitComboBox .dijitDownArrowButton { - border-left:0px !important; +.dj_ff2 .dijit_a11y .dijitComboButton .dijitButtonContentsFocused, +.dj_ff2 .dijit_a11y .dijitComboButton .dijitDownArrowButtonFocused { + border: 1px dotted black !important; +} + +/* button inner contents - labels, icons etc. */ +.dijitButtonNode * { + vertical-align: middle; +} +.dijit_a11y .dijitArrowButtonInner { + width: 1.0em; + display: none !important; +} +.dijitButtonNode .dijitArrowButtonInner { + background:no-repeat center; + width: 16px; +} +.dijitComboBox .dijitArrowButtonInner { + display: block; } /* In high contrast mode, display the check symbol */ -.dijit_a11y .dijitToggleButtonChecked .dijitToggleButtonIconChar { - display: inline !important; +.dijit_a11y .dijitToggleButtonChecked .dijitToggleButtonIconChar { + display: inline !important; } - /**** - 3-element borders: ( dijitLeft + dijitStretch + dijitRight ) + 3-element borders: ( dijitLeft + dijitStretch + dijitRight ) ****/ .dijitLeft { @@ -232,87 +242,118 @@ background-repeat:no-repeat; } - -/**** - Right-to-left rules - ****/ -.dijitRTL .dijitRightArrow { - /* it becomes a left arrow for LTR locales */ - /* MOW: TODO... */ - margin-left:-2.1em; -} - - - - - -/**** - dijit.form.Button - dijit.form.DropDownButton - dijit.form.ComboButton - dijit.form.ComboBox (partial) - ****/ .dijitButton, .dijitDropDownButton, -.dijitComboButton, -.dijitComboBox { +.dijitComboButton { /* outside of button */ margin: 0.2em; - /* normalize line-heights inside the button */ - line-height: 1.3em; +} + +.dijitToolbar .dijitButton, +.dijitToolbar .dijitDropDownButton, +.dijitToolbar .dijitComboButton { + margin: 0; +} + +.dj_ie .dijitToolbar button, +.dj_safari .dijitToolbar button { + /* FF adds implicit padding to buttons so make other browsers follow suit, + * to avoid a bunch of browse specific rules in theme files + */ + padding: 1px 2px; +} + +.dj_ie .dijitComboButton { + /* hack to get inline-table to vertically align w/other buttons */ + margin-bottom: -3px; } .dj_safari .dijitToolbar .dijitDropDownButton { padding-left: 0.3em; } +.dj_gecko .dijitToolbar .dijitButtonNode::-moz-focus-inner { + padding:0; +} .dijitButtonNode { /* Node that is acting as a button -- may or may not be a BUTTON element */ border:1px solid gray; - margin:0px; - padding:.2em .2em .1em .2em; - overflow:visible; + margin:0; line-height:normal; - font-family:inherit; - font-size:inherit; - color: inherit; cursor:pointer; - vertical-align:middle; + vertical-align: middle; + #vertical-align: auto; text-align:center; white-space: nowrap; } -.dijitDownArrowButton, -.dijitUpArrowButton { +/* +.dijitButtonNode button { + cursor: pointer; +} +*/ + +.dj_ie .dijitButtonNode { + /* ensure hasLayout */ + zoom: 1; +} + +.dj_ie .dijitButtonNode button { + /* + disgusting hack to get rid of spurious padding around button elements + on IE. MSIE is truly the web's boat anchor. + */ + overflow: visible; + cursor: pointer; +} + +.dijitArrowButton { /* Node that is acting as a arrow button -- drop down (spinner has its own treatment). Also gets dijitButtonNode */ /* place AFTER dijitButtonNode so it overrides */ - padding:0em .4em; - margin:0px; - font-size: 0.7em; + padding: 0 .4em; +} +DIV.dijitArrowButton { + float: right; } - -.dijitButtonContents { - color:inherit; +.dijitSpinner .dijitInputLayoutContainer .dijitArrowButton { + border-style: solid; + border-width: 0 0 0 1px !important; + padding: 0; + position: absolute; + right: 0; + float: none; +} +.dijitSpinner .dijitInputLayoutContainer .dijitArrowButton { + position: absolute; + height: 50%; +} +.dijitSpinner .dijitInputLayoutContainer .dijitDownArrowButton { + top: none; + bottom: 0; + border-top-width: 1px !important; +} +.dijitSpinner .dijitInputLayoutContainer .dijitUpArrowButton { + top: 0; + bottom: none; } -.dijitDropDownButton .dijitA11yDownArrow { - margin-left:.8em; +TABLE.dijitComboButton { + /* In ComboButton, borders are on each cell rather than on
- - +
-
-
+
+
@@ -16,7 +16,7 @@
itself */ + border-collapse: collapse; + border:0; + padding:0; + margin:0; } - -.dijitComboButton TABLE { - /* each cell in a combo-table should have its own separate border */ +.dijitToolbar .dijitComboButton { + /* because Toolbar only draws a border around the hovered thing */ border-collapse: separate; - border:0px; - padding:0px; - margin:0px; } -.dijitComboButton .dijitButtonContents { - border-right-width:0px !important; +.dj_ie BUTTON.dijitButtonNode { + overflow: visible; /* eliminates arbitrary left and right padding on buttons */ } - table .dijitButton .dijitButtonNode, table .dijitComboButton .dijitButtonNode { #overflow:hidden; /* visible messes up if the button is inside a table on IE */ @@ -323,7 +364,7 @@ table .dijitComboButton .dijitButtonNode { .dijitButtonNode IMG { /* make text and images line up cleanly */ vertical-align:middle; - margin-bottom:.2em; + /*margin-bottom:.2em;*/ } /****** @@ -335,7 +376,14 @@ table .dijitComboButton .dijitButtonNode { .dijitComboBox, .dijitSpinner { border: solid black 1px; + #overflow: hidden; /* #6027, #6067 */ width: 15em; /* need to set default size on outer node since inner nodes say and ","","");}_d.push("
. user can override */ + vertical-align: middle; + #vertical-align: auto; +} + +.dijitTimeTextBox { + width: 8em; } /* rules for safari to deal with fuzzy blue focus border */ @@ -346,92 +394,66 @@ table .dijitComboButton .dijitButtonNode { } .dijitTextBoxFocused, .dijitComboBoxFocused, -.dijitSpinnerFocused { +.dijitSpinnerFocused, +.dijitTextAreaFocused { /* should we display focus like we do on other browsers, or use the safari standard focus indicator?? */ outline: auto 5px -webkit-focus-ring-color; } +.dijitTextAreaFocused div { + /* prevent dotted border on FF3 */ + outline: none !important; +} .dijitTextBox INPUT, .dijitComboBox INPUT, .dijitSpinner INPUT { - padding:0px; border-left: solid black 1px; /* TODO: for RTL mode should be border-right */ display:inline; position:static !important; - border:0px !important; - margin:0px !important; - vertical-align:0em !important; + border:0 !important; + margin:0 !important; + vertical-align:top !important; visibility:visible !important; background-color:transparent !important; background-image:none !important; width:100% !important; } -/* #4711: prevent IE from over-expanding 100% width input boxes */ -.dj_ie .dijitTextBox .dijitInputField, -.dj_ie .dijitComboBox .dijitInputField, -.dj_ie .dijitSpinner .dijitInputField { - position:relative; -} -.dj_ie .dijitTextBox .dijitInputField INPUT, -.dj_ie .dijitComboBox .dijitInputField INPUT, -.dj_ie .dijitSpinner .dijitInputField INPUT { - position:absolute !important; - top:auto !important; - left:auto !important; - right:auto !important; - bottom:auto !important; - font-size:100%; -} - -.dj_ie INPUT.dijitTextBox { - font-size:100%; -} - /* Display an "X" for invalid input. Themes will override these rules to display an icon instead. */ -.dijitValidationIcon { display: none; background-position-y:center; } -.dijitValidationIconText { visibility: hidden; } +.dijitValidationIcon { + visibility: hidden; + display: block; + padding: 0 2px; + float: right; + height: auto; +} +.dijitValidationIconText { + visibility: hidden; + display: none; + float:right; + font-family: sans-serif; + font-style:italic; + font-size: 0.45em; + line-height: 190%; +} .dijit_a11y .dijitValidationIcon { display: none !important; } .dijit_a11y .dijitValidationIconText { display: block !important; } -.dijitTextBoxError .dijitValidationIconText, -.dijitComboBoxError .dijitValidationIconText, -.dijitSpinnerError .dijitValidationIconText { +.dijitError .dijitValidationIcon, +.dijitError .dijitValidationIconText { visibility: visible; } -.dijitSpinner .dijitDownArrowButton, -.dijitSpinner .dijitUpArrowButton { - padding: 0 .4em; - border: 1px solid; - line-height: .769em; - /* TODO: as we use border-collapse, is this necessary? */ - border-left-style: none; -} -.dj_ie .dijitSpinner .dijitDownArrowButton, -.dj_ie .dijitSpinner .dijitUpArrowButton { - padding: 0 .2em!important; - text-align: center; -} -.dijitSpinner .dijitDownArrowButton div, -.dijitSpinner .dijitUpArrowButton div { - text-align: center; - font-size: .769em; - line-height: 1em; - vertical-align: baseline; - margin: 0 auto; -} - -.dijitTextBox .dijitDownArrowButton { +.dijitTextBox .dijitArrowButton { /* this is for a combo box with no arrow displayed; we set baseClass=TextBox */ display:none; } /**** dijit.form.CheckBox - & - dijit.form.RadioButton + & + dijit.form.RadioButton ****/ .dijitCheckBox, @@ -443,19 +465,19 @@ table .dijitComboButton .dijitButtonNode { height: 16px; background-position:center center; background-repeat:no-repeat; + overflow: hidden; } .dijitCheckBox INPUT, .dijitRadio INPUT { - margin: 0; + margin: 0; padding: 0; display: block; } - + .dijitCheckBoxInput { /* place the actual input on top, but all-but-invisible */ opacity: 0.01; - overflow:hidden; } .dj_ie .dijitCheckBoxInput { @@ -478,7 +500,7 @@ table .dijitComboButton .dijitButtonNode { /**** dijit.ProgressBar ****/ - + .dijitProgressBarEmpty{ /* outer container and background of the bar that's not finished yet*/ position:relative;overflow:hidden; @@ -493,19 +515,21 @@ table .dijitComboButton .dijitButtonNode { z-index:-1; top:0; width:100%; - height:100%; +} +.dj_ie6 .dijitProgressBarFull { + height:1.6em; } -.dijitProgressBarTile{ +.dijitProgressBarTile { /* inner container for finished portion */ position:absolute; overflow:hidden; - top:0px; - left:0px; - bottom:0px; - right:0px; - margin:0px; - padding:0px; + top:0; + left:0; + bottom:0; + right:0; + margin:0; + padding:0; width:auto; height:auto; background-color:#aaa; @@ -519,31 +543,26 @@ table .dijitComboButton .dijitButtonNode { background-color:transparent !important; } -.dj_iequirks .dijitProgressBarTile{ - width:100%; - height:100%; -} - -.dj_ie6 .dijitProgressBarTile{ +.dj_ie6 .dijitProgressBarTile { /* width:auto works in IE6 with position:static but not position:absolute */ position:static; - /* height:auto does not work in IE6 */ - height:100%; + /* height:auto or 100% does not work in IE6 */ + height:1.6em; } -.dijitProgressBarIndeterminate .dijitProgressBarLabel{ +.dijitProgressBarIndeterminate .dijitProgressBarLabel { visibility:hidden; } -.dijitProgressBarIndeterminate .dijitProgressBarTile{ +.dijitProgressBarIndeterminate .dijitProgressBarTile { /* animated gif for 'indeterminate' mode */ } -.dijitProgressBarIndeterminateHighContrastImage{ +.dijitProgressBarIndeterminateHighContrastImage { display:none; } -.dijit_a11y .dijitProgressBarIndeterminate .dijitProgressBarIndeterminateHighContrastImage{ +.dijit_a11y .dijitProgressBarIndeterminate .dijitProgressBarIndeterminateHighContrastImage { display:block; position:absolute; top:0; @@ -554,27 +573,14 @@ table .dijitComboButton .dijitButtonNode { height:auto; } -.dijitProgressBarLabel{ +.dijitProgressBarLabel { display:block; position:static; width:100%; text-align:center; - background-color:transparent; + background-color:transparent !important; } -/* progress bar in vertical mode - TODO: remove? no longer supported? */ -.dijitProgressBarVertical .dijitProgressBarFull{ - bottom:0px; /* start at the bottom */ -} - -.dj_ie6 .dijitProgressBarVertical .dijitProgressBarTile{ - position:absolute; - /* can't use position:static here -- need absolute positioning to place - the bar at the bottom of a vertical progressbar */ - width:100%; -} - - /**** dijit.Tooltip ****/ @@ -588,12 +594,7 @@ table .dijitComboButton .dijitButtonNode { top: -10000px; overflow: visible; } -/* -See http://trac.dojotoolkit.org/ticket/5006 -.dijitTooltipDialog { - position: relative; -} -*/ + .dijitTooltipContainer { border: solid black 2px; background: #b8b5b5; @@ -609,11 +610,14 @@ See http://trac.dojotoolkit.org/ticket/5006 position: absolute; } +.dijitTooltipData { + display:none; +} /* MOW: using actual images at this time /* draw an arrow with CSS only * / .dijitTooltipConnector { /* the border on the triangle * / - font-size: 0px; line-height: 0%; width: 0px; + font-size: 0; line-height: 0%; width: 0; border-top: none; border-bottom: 14px solid black; border-left: 7px solid transparent; @@ -625,7 +629,7 @@ See http://trac.dojotoolkit.org/ticket/5006 .dijitTooltipConnector div { /* the background of the triangle * / - font-size: 0px; line-height: 0%; width: 0px; + font-size: 0; line-height: 0%; width: 0; position: absolute; border-bottom: 10px solid #b8b5b5; border-left: 5px solid transparent; @@ -642,10 +646,10 @@ See http://trac.dojotoolkit.org/ticket/5006 /* Layout widgets. This is essential CSS to make layout work (it isn't "styling" CSS) make sure that the position:absolute in dijitAlign* overrides other classes */ -.dijitLayoutContainer{ +.dijitLayoutContainer{ position: relative; display: block; - overflow: hidden; + overflow: hidden; } body .dijitAlignTop, @@ -653,16 +657,88 @@ body .dijitAlignBottom, body .dijitAlignLeft, body .dijitAlignRight { position: absolute; - overflow: hidden; + overflow: hidden; } body .dijitAlignClient { position: absolute; } -/* SplitContainer +/* + * BorderContaienr + * + * .dijitBorderContainer is a stylized layout where panes have border and margin. + * .dijitBorderContainerNoGutter is a raw layout. + */ +.dijitBorderContainer, .dijitBorderContainerNoGutter { + position:relative; + overflow: hidden; +} + +.dijitBorderContainerPane, +.dijitBorderContainerNoGutterPane { + position: absolute !important; /* !important to override position:relative in dijitTabContainer etc. */ + z-index: 2; /* above the splitters so that off-by-one browser errors don't cover up border of pane */ +} + +.dijitBorderContainer > .dijitTextArea { + /* On Safari, for SimpleTextArea inside a BorderContainer, + don't want to display the grip to resize */ + resize: none; +} + +.dijitGutter { + /* gutter is just a place holder for empty space between panes in BorderContainer */ + position: absolute; + font-size: 1px; /* needed by IE6 even though div is empty, otherwise goes to 15px */ +} + +/* SplitContainer 'V' == container that splits vertically (up/down) 'H' = horizontal (left/right) */ + +.dijitSplitter { + position: absolute; + overflow: hidden; + z-index: 1; /* behind the panes */ + background-color: #fff; + border-color: gray; + border-style: solid; + border-width: 0; + z-index: 11; +} + +.dijitSplitterActive { + z-index: 11 !important; +} + +.dijitSplitterCover{ + position:absolute; + z-index:1; + top:0; + left:0; + width:100%; + height:100%; +} + +/* #6945: stop mouse events */ +.dj_ie .dijitSplitterCover{ + background: white; + filter: alpha(opacity=0) +} + +.dijitSplitterH { + height: 7px; + border-top:1px; + border-bottom:1px; + cursor: ns-resize; +} +.dijitSplitterV { + width: 7px; + border-left:1px; + border-right:1px; + cursor: ew-resize; +} .dijitSplitContainer{ position: relative; overflow: hidden; @@ -685,25 +761,21 @@ body .dijitAlignClient { position: absolute; } margin: 0; } -.dijitSplitContainerSizerV { - cursor: n-resize; -} - -.dijitSplitContainerSizerH .thumb { +.dijitSplitContainerSizerH .thumb, .dijitSplitterV .dijitSplitterThumb { + overflow:hidden; position:absolute; top:49%; } -.dijitSplitContainerSizerV .thumb { +.dijitSplitContainerSizerV .thumb, .dijitSplitterH .dijitSplitterThumb { position:absolute; left:49%; } +.dijitSplitterShadow, .dijitSplitContainerVirtualSizerH, .dijitSplitContainerVirtualSizerV { font-size: 1px; - cursor: move; - cursor: w-resize; background-color: ThreeDShadow; -moz-opacity: 0.5; opacity: 0.5; @@ -711,10 +783,21 @@ body .dijitAlignClient { position: absolute; } margin: 0; } -.dijitSplitContainerVirtualSizerV { +.dj_ie .dijitSplitterV, .dijitSplitContainerVirtualSizerH { + cursor: w-resize; +} +.dj_ie .dijitSplitterH, .dijitSplitContainerSizerV, .dijitSplitContainerVirtualSizerV { cursor: n-resize; } +.dijit_a11y .dijitSplitterH { + border-top:1px solid #d3d3d3 !important; + border-bottom:1px solid #d3d3d3 !important; +} +.dijit_a11y .dijitSplitterV { + border-left:1px solid #d3d3d3 !important; + border-right:1px solid #d3d3d3 !important; +} /* ContentPane */ @@ -727,13 +810,16 @@ body .dijitAlignClient { position: absolute; } display: block; overflow: hidden; } +.dj_ie7 .dijitTitlePaneTextNode { + display:inline; +} /* Color Palette */ .dijitColorPalette { border:1px solid #999; background:#fff; - -moz-border-radius:3pt; + -moz-border-radius:3pt; } img.dijitColorPaletteUnder { @@ -743,50 +829,48 @@ img.dijitColorPaletteUnder { top:0; } .dijitColorPaletteInner { - position: relative; + position: relative; overflow:hidden; outline:0; } +.dijitPaletteCell { + width: 20px; + height: 20px; + position: absolute; + overflow: hidden; + z-index: 10; + outline-width: 0; +} .dijitPaletteImg { width: 16px; /*This is the width of one color in the provided palettes. */ height: 14px; /* Height of one color in the provided palettes. */ position: absolute; + top: 1px; + left: 1px; overflow: hidden; cursor: default; - z-index: 10; - border:1px solid #999; + border:1px solid #999; /* -moz-border-radius:2pt; */ } -.dijitPaletteImgHighlight { +.dijitPaletteCellHighlight img { width: 14px; /*This is the width of one color in the provided palettes. */ height: 12px; /* Height of one color in the provided palettes. */ position: absolute; + top: 1px; + left: 1px; overflow: hidden; cursor: default; - z-index: 10; -} - -/* .dijitPaletteImg:hover, */ -.dijitPaletteImg:focus, -.dijitPaletteImgHighlight { - width: 14px; /*This is the width of one color in the provided palettes. */ - height: 12px; /* Height of one color in the provided palettes. */ - border:2px solid #000; - outline:2px solid #dedede; + border:2px solid #000; + outline:1px solid #dedede; /* -moz-border-radius:0; */ } - -.dijitColorPaletteCell { - width:16px; - height:14px; - border: 1px solid; +.dijit_a11y .dijitPaletteCell { + background-color:transparent !important; } - -.dijitColorPaletteCell:hover { - border-style: solid; - outline:0; +.dijit_a11y .dijitPaletteImg { + background-color:transparent !important; } /* Accordion */ @@ -799,44 +883,42 @@ img.dijitColorPaletteUnder { overflow: auto; } +/* #7104 - workaround IE jankyness with overflows */ +.dj_ie .dijitAccordionBody { + position:relative; +} .dijitAccordionContainer { border:1px solid #b7b7b7; - border-top:0 !important; + border-top:0 !important; } -.dijitAccordionPane .dijitAccordionTitle:hover { +.dijitAccordionTitle:hover { cursor: pointer; } -.dijitAccordionPane .dijitAccordionTitle .dijitAccordionArrow { - float: right; -} - /* images off, high-contrast mode styles */ .dijitAccordionPane .dijitAccordionTitle .arrowTextUp, .dijitAccordionPane .dijitAccordionTitle .arrowTextDown { - display: none; - float: right; - font-size: 0.65em; + display: none; + font-size: 0.65em; font-weight: normal !important; } -.dijit_a11y .dijitAccordionPane .dijitAccordionTitle .arrowTextUp { - display: inline; +.dijit_a11y .dijitAccordionTitle .arrowTextUp { + display: inline; +} +.dijit_a11y .dijitAccordionTitle-selected .arrowTextDown { + display: inline; } -.dijit_a11y .dijitAccordionPane-selected .dijitAccordionTitle .arrowTextDown { - display: inline; -} - -.dijit_a11y .dijitAccordionPane-selected .dijitAccordionTitle .arrowTextUp { - display: none; +.dijit_a11y .dijitAccordionTitle-selected .arrowTextUp { + display: none; } /* Calendar */ -.dijitCalendarContainer thead tr th, .dijitCalendarContainer thead tr td, .dijitCalendarContainer tbody tr td, .dijitCalendarContainer tfoot tr td { +.dijitCalendarContainer thead tr th, .dijitCalendarContainer thead tr td, .dijitCalendarContainer tbody tr td, .dijitCalendarContainer tfoot tr td { padding: 0; } @@ -863,26 +945,15 @@ img.dijitColorPaletteUnder { cursor:hand; } -.dijitCalendarPreviousMonthDisabled { - cursor:default !important -} - -.dijitCalendarCurrentMonthDisabled { - cursor:default !important -} - +.dijitCalendarPreviousMonthDisabled, +.dijitCalendarCurrentMonthDisabled, .dijitCalendarNextMonthDisabled { - cursor:default !important; + cursor:default !important } -.dijitCalendarDateTemplate { - cursor:pointer; -} - -.dijitCalendarSelectedYear { - cursor:pointer; -} -.dijitCalendarNextYear, +.dijitCalendarDateTemplate, +.dijitCalendarSelectedYear, +.dijitCalendarNextYear, .dijitCalendarPreviousYear { cursor:pointer; } @@ -903,13 +974,14 @@ img.dijitColorPaletteUnder { background-color:white; } .dijitMenuTable { - margin:1px 0px; + margin:1px 0; border-collapse:collapse; - border-width:0px; + border-width:0; background-color:white; } .dijitMenuItem{ + text-align: left; white-space: nowrap; padding:.1em .2em; } @@ -923,7 +995,6 @@ img.dijitColorPaletteUnder { .dijitMenuItemIcon { position: relative; - background-position: center center; background-repeat: no-repeat; } @@ -952,72 +1023,117 @@ img.dijitColorPaletteUnder { border: 1px #fff dotted !important; } -.dijit_a11y .dijitMenuExpandInner { - display:block !important; -} +.dijitMenuExpandA11y { + display: none; +} +.dijit_a11y .dijitMenuExpandA11y { + display: inline; +} -/* separator can be two pixels -- set border of either one to 0px to have only one */ +/* separator can be two pixels -- set border of either one to 0 to have only one */ .dijitMenuSeparatorTop { height: 50%; - margin: 0px; + margin: 0; margin-top:3px; font-size: 1px; } .dijitMenuSeparatorBottom { height: 50%; - margin: 0px; + margin: 0; margin-bottom:3px; font-size: 1px; } +/* the checked menu item */ +.dijitCheckedMenuItemIconChar { + vertical-align: middle; + visibility:hidden; +} +.dijitCheckedMenuItemIconChecked .dijitCheckedMenuItemIconChar { + visibility:visible !important; +} +.dijit_a11y .dijitCheckedMenuItemIconChar { + display:block !important; +} /* Tab */ - -.dijitTabContainer .dijitAlignTop { -/* position the tab labels row down by 1 px, and on top of the dijitTabPaneWrapper - so the buttons can overlay the tab pane properly */ - top:1px !important; - z-index:10; +.dijitTabContainerBottom-tabs, +.dijitTabContainerTop-tabs, +.dijitTabContainerLeft-tabs, +.dijitTabContainerRight-tabs { + z-index:10; + overflow: visible !important; /* so tabs can cover up border adjacent to container */ } -.dijitTabContainer .dijitAlignBottom { -/* position the tab labels row up by 1 px so they overlap */ - margin-top:-1px !important; - z-index:10; -} - -.dijitTabContainer .dijitAlignLeft { -/* position the tab labels left by 1 px so they overlap */ - margin-right:-1px !important; - z-index:10; -} - -.dijitTabContainer .dijitAlignRight { -/* position the tab labels row up by 1 px, and on top of the dijitTabPaneWrapper - so the buttons can overlay the tab pane properly */ - margin-left:-1px !important; - z-index:10; -} - -.dijitTabPaneWrapper { +.dijitTabContainerBottom-container, +.dijitTabContainerTop-container, +.dijitTabContainerLeft-container, +.dijitTabContainerRight-container { z-index:0; overflow: hidden; + border: 1px solid black; } +.dijitTabContainerTop-tabs { + border-bottom: 1px solid black; +} +.dijitTabContainerTop-container { + border-top: 0px; +} + +.dijitTabContainerLeft-tabs { + border-right: 1px solid black; +} +.dijitTabContainerLeft-container { + border-left: 0px; +} + +.dijitTabContainerBottom-tabs { + border-top: 1px solid black; +} +.dijitTabContainerBottom-container { + border-bottom: 0px; +} + +.dijitTabContainerRight-tabs { + border-left: 1px solid black +} +.dijitTabContainerRight-container { + border-right: 0px; +} + + .dijitTab { position:relative; - float:left; cursor:pointer; white-space:nowrap; z-index:3; } -.dijitTabContainer .dijitAlignLeft .dijitTab, -.dijitTabContainer .dijitAlignRight .dijitTab { - float:none; +.dijitTabContainerTop-tabs .dijitTab { + top: 1px; /* to overlap border on .dijitTabContainerTop-tabs */ +} +.dijitTabContainerBottom-tabs .dijitTab { + top: -1px; /* to overlap border on .dijitTabContainerBottom-tabs */ +} +.dijitTabContainerLeft-tabs .dijitTab { + left: 1px; /* to overlap border on .dijitTabContainerLeft-tabs */ +} +.dijitTabContainerRight-tabs .dijitTab { + left: -1px; /* to overlap border on .dijitTabContainerRight-tabs */ +} + + +.dijitTabContainerTop-tabs .dijitTab, +.dijitTabContainerBottom-tabs .dijitTab { + /* Inline-block */ + display:-moz-inline-box; /* FF2 */ + display:inline-block; /* webkit and FF3 */ + #zoom: 1; /* set hasLayout:true to mimic inline-block */ + #display:inline; /* don't use .dj_ie since that increases the priority */ } .dijitTabInnerDiv { @@ -1033,22 +1149,22 @@ img.dijitColorPaletteUnder { /* images off, high-contrast mode styles */ .dijitTab .closeText { display:none; - padding: 0px 2px; - margin: 0px 2px; + padding: 0 2px; + margin: 0 2px; } -.dijit_a11y .dijitTab .closeImage { - padding: 0px !important; - margin: 0px !important; - top: 0px !important; - bottom: 0px !important; + +.dijit_a11y .closeText { + display:inline; + margin-left:6px; } -.dijit_a11y .closeText { - display:inline; - margin-left:6px; -} -.dijit_a11y .closeText:hover { + +.dijit_a11y .dijitTab .dijitClosable .closeImage { + display:none; +} + +.dijit_a11y .closeText:hover { border:thin solid; -} +} .dijit_a11y .dijitTabChecked { border-style:dashed !important; } @@ -1074,7 +1190,7 @@ img.dijitColorPaletteUnder { .dijitInlineEditor .dijitButtonContainer { /* div around the buttons -- makes them float below the field */ position:absolute; - right:0px; + right:0; overflow:visible; } @@ -1084,35 +1200,36 @@ img.dijitColorPaletteUnder { /* Tree */ -.dijitTreeExpando { - float: left; - display: inline; - clear:both; +.dijitTreeRow, .dijitTreeContent { + white-space: nowrap; } -.dijitTreeExpand { - float: left; - display: inline; +.dijitTreeRow img { + /* make the expando and folder icons line up with the label */ + vertical-align: middle; } .dijitTreeContent { cursor: default; - /* can't make inline - multiline bugs */ } -.dijitExpandoText { - display: none; -} - -.dijit_a11y .dijitExpandoText { - float: left; - display: inline; +.dijitExpandoText { + display: none; +} + +.dijit_a11y .dijitExpandoText { + display: inline; padding-left: 10px; - padding-right: 10px; + padding-right: 10px; font-family: monospace; border-style: solid; border-width: thin; -} + cursor: pointer; +} + +.dijitTreeLabel { + margin: 0px 4px; +} /* Dialog */ @@ -1122,17 +1239,21 @@ img.dijitColorPaletteUnder { padding: 1px; } +.dijitDialogFixed div.dijitDialogTitleBar { + cursor:default; +} + .dijitDialogUnderlayWrapper { position: absolute; - left: 0px; - top: 0px; + left: 0; + top: 0; z-index: 998; display: none; - background: transparent; + background: transparent !important; } .dijitDialogUnderlay { - background: #eeeeee; + background: #eee; opacity: 0.5; } @@ -1141,6 +1262,7 @@ img.dijitColorPaletteUnder { } /* images off, high-contrast mode styles */ +.dijit_a11y .dijitInputLayoutContainer, .dijit_a11y .dijitDialog { opacity: 1 !important; background-color: white !important; @@ -1148,10 +1270,11 @@ img.dijitColorPaletteUnder { .dijitDialog .closeText { display:none; + /* for the onhover border in high contrast on IE: */ position:absolute; } -.dijit_a11y .dijitDialog .closeText { +.dijit_a11y .dijitDialog .closeText { display:inline; } @@ -1162,18 +1285,18 @@ img.dijitColorPaletteUnder { vertical-align:middle; } -.dijitHorizontalSliderMoveable { - right:0px; +.dijitSliderMoveableH { + right:0; } .dijit_a11y div.dijitSliderImageHandle, .dijitSliderImageHandle { - margin:0px; - padding:0px; + margin:0; + padding:0; position:absolute !important; border:8px solid gray; - width:0px; - height:0px; + width:0; + height:0; } .dijit_a11y .dijitSliderFocused .dijitSliderImageHandle { border:4px solid #000; @@ -1181,12 +1304,12 @@ img.dijitColorPaletteUnder { width:8px; } -.dijitVerticalSliderImageHandle { +.dijitSliderImageHandleV { top:-8px; left:-6px; } -.dijitHorizontalSliderImageHandle { +.dijitSliderImageHandleH { left:-8px; top:-5px; vertical-align:top; @@ -1197,29 +1320,40 @@ img.dijitColorPaletteUnder { border-color:black; } -.dijitHorizontalSliderBar { - height:4px; - border-width:1px 0px; +.dijitSliderBarContainerV { + position:relative; + height:100%; + z-index:1; } -.dijitVerticalSliderBar { +.dijitSliderBarContainerH { + position:relative; + z-index:1; +} + +.dijitSliderBarH { + height:4px; + border-width:1px 0; +} + +.dijitSliderBarV { width:4px; - border-width:0px 1px; + border-width:0 1px; } .dijitSliderProgressBar { background-color:red; - #z-index:0; + z-index:1; } -.dijitVerticalSliderProgressBar { +.dijitSliderProgressBarV { position:static !important; height:0%; vertical-align:top; text-align:left; } -.dijitHorizontalSliderProgressBar { +.dijitSliderProgressBarH { position:absolute !important; width:0%; vertical-align:middle; @@ -1229,145 +1363,133 @@ img.dijitColorPaletteUnder { .dijitSliderRemainingBar { overflow:hidden; background-color:transparent; - #z-index:-1; + z-index:1; } -.dijitVerticalSliderRemainingBar { +.dijitSliderRemainingBarV { height:100%; text-align:left; } -.dijitHorizontalSliderRemainingBar { +.dijitSliderRemainingBarH { width:100% !important; } /* the slider bumper is the space consumed by the slider handle when it hangs over an edge */ .dijitSliderBumper { overflow:hidden; - #z-index:-1 + z-index:1; } -.dijitVerticalSliderBumper { +.dijitSliderBumperV { width:4px; height:8px; - border-width:0px 1px; + border-width:0 1px; } -.dijitHorizontalSliderBumper { +.dijitSliderBumperH { width:8px; height:4px; - border-width:1px 0px; + border-width:1px 0; } -.dijitVerticalSliderBottomBumper, -.dijitHorizontalSliderLeftBumper { +.dijitSliderBottomBumper, +.dijitSliderLeftBumper { background-color:red; } -.dijitVerticalSliderTopBumper, -.dijitHorizontalSliderRightBumper { +.dijitSliderTopBumper, +.dijitSliderRightBumper { background-color:transparent; } -.dijitHorizontalSliderDecoration { +.dijitSliderDecorationH { text-align:center; } .dijitSlider .dijitSliderButton { font-family:monospace; - margin:0px; - padding:0px; + margin:0; + padding:0; display:block; } .dijit_a11y .dijitSliderButtonInner { - visibility:visible !important; -} - -.dijitSlider .dijitVerticalSliderTopButton { - vertical-align:bottom; -} - -.dijitSlider .dijitVerticalSliderBottomButton { - vertical-align:top; + visibility:visible !important; } .dijitSliderButtonContainer { text-align:center; - height:0px; + height:0; } .dijitSlider .dijitButtonNode { - padding:0px; + padding:0; display:block; } -.dj_ie .RuleContainer { - z-index: -1; /* #4809 */ -} - -.RuleContainer { +.dijitRuleContainer { position:relative; overflow:visible; } -.VerticalRuleContainer { +.dijitRuleContainerV { height:100%; - line-height:0px; + line-height:0; float:left; text-align:left; } -.dj_opera .VerticalRuleContainer { +.dj_opera .dijitRuleContainerV { line-height:2%; } -.dj_ie .VerticalRuleContainer { +.dj_ie .dijitRuleContainerV { line-height:normal; } -.dj_gecko .VerticalRuleContainer { - margin:0px 0px 1px 0px; /* mozilla bug workaround for float:left,height:100% block elements */ +.dj_gecko .dijitRuleContainerV { + margin:0 0 1px 0; /* mozilla bug workaround for float:left,height:100% block elements */ } -.RuleMark { +.dijitRuleMark { position:absolute; border:1px solid black; - line-height:0px; + line-height:0; height:100%; } -.HorizontalRuleMark { - width:0px; - border-top-width:0px !important; - border-bottom-width:0px !important; - border-left-width:0px !important; +.dijitRuleMarkH { + width:0; + border-top-width:0 !important; + border-bottom-width:0 !important; + border-left-width:0 !important; } -.RuleLabelContainer { +.dijitRuleLabelContainer { position:absolute; } -.HorizontalRuleLabelContainer { +.dijitRuleLabelContainerH { text-align:center; display:inline-block; } -.HorizontalRuleLabel { +.dijitRuleLabelH { position:relative; left:-50%; } -.VerticalRuleMark { - height:0px; - border-right-width:0px !important; - border-bottom-width:0px !important; - border-left-width:0px !important; +.dijitRuleMarkV { + height:0; + border-right-width:0 !important; + border-bottom-width:0 !important; + border-left-width:0 !important; width:100%; - left:0px; + left:0; } -.dj_ie .VerticalRuleLabelContainer { +.dj_ie .dijitRuleLabelContainerV { margin-top:-.55em; } @@ -1378,15 +1500,29 @@ img.dijitColorPaletteUnder { .dijitTextArea { width:100%; + overflow: auto; /* w/out this IE's SimpleTextArea goes to overflow: scroll */ +} +.dijitTextArea > DIV { + text-decoration:none; + overflow:auto; + min-height: 1.40em; } .dj_ie .dijitTextArea p { - margin-top:0px; - margin-bottom:0px; + margin-top:0; + margin-bottom:0; + line-height: normal !important; +} + +.dijitToolbarSeparator { + height: 18px; + width: 5px; + padding: 0 1px; + margin: 0; } /* Editor */ -.IEFixedToolbar { +.dijitIEFixedToolbar { position:absolute; /* top:0; */ top: expression(eval((document.documentElement||document.body).scrollTop)); @@ -1399,45 +1535,35 @@ img.dijitColorPaletteUnder { border:0; padding:2px 8px 2px 8px; } -.dijitTimePickerTick { - /* opacity:0.1 !important; */ - color:#dedede; - border-bottom:1px solid #dedede; - border-top:1px solid #dedede; - position:relative; -} -.dijitTimePickerTick .dijitTimePickerItemInner { - font-size:0.25em; -} + +.dijitTimePickerTick, .dijitTimePickerMarker { - background-color:#ededed; - border-top:1px solid #999; - border-bottom:1px solid #999; + border-bottom:1px solid gray; } -.dijitTimePickerItemHover { - opacity:1 !important; - background-color:#808080; - color:#fff; - border-top:1px solid #333; - border-bottom:1px solid #333; - cursor:pointer; -} -.dijitTimePickerMarker.dijitTimePickerItemHover { - font-size:1.3em; +.dijitTimePicker .dijitDownArrowButton { + border-top: none !important; } -.dijitTimePickerItemHover .dijitTimePickerItemInner { - display:block; - overflow:visible; - background-color:#808080; - font-size:1em; +.dijitTimePickerTick { + color:#CCC; +} + +.dijitTimePickerMarker { + color:black; + background-color:#CCC; } .dijitTimePickerItemSelected { font-weight:bold; color:#333; - background-color:#b7cdee !important; + background-color:#b7cdee; +} + +.dijitTimePickerItemHover { + background-color:gray; + color:white; + cursor:pointer; } .dijit_a11y .dijitTimePickerItem { @@ -1447,15 +1573,57 @@ img.dijitColorPaletteUnder { /* Disable the high contrast character */ .dijitToggleButtonIconChar { - display:none !important; + display:none !important; } .dijit_a11y .dijitToggleButtonIconChar { display:inline !important; } .dijit_a11y .dijitToggleButtonIconChar { - visibility:hidden; + visibility:hidden; } .dijit_a11y .dijitToggleButtonChecked .dijitToggleButtonIconChar { visibility:visible !important; } + +.dijitArrowButtonChar { + display:none !important; +} +.dijit_a11y .dijitArrowButtonChar { + display:inline !important; +} +.dijitInputLayoutContainer { + position: relative; + overflow: hidden; +} +.dijitSpinnerButtonContainer { + float: right; + width: 18px; + position: relative; + overflow: hidden; +} +.dijitSpinner .dijitInputLayoutContainer .dijitArrowButton { + height: 50%; + width: 16px; + overflow: hidden; +} +.dijitSpinner .dijitInputLayoutContainer .dijitArrowButtonInner { + overflow: hidden; + line-height: 50%; +} +.dijit_a11y .dijitSpinner .dijitInputLayoutContainer .dijitArrowButton { + width: 100%; +} +.dijit_a11y .dijitSpinner .dijitArrowButton .dijitArrowButtonChar { + font-size: 0.4em; + vertical-align: top; +} +.dijit_a11y .dijitSpinnerButtonContainer { + width: 0.5em; + margin-left: 2px; + overflow: visible; +} +.dijit_a11y .dijitSpinnerButtonContainer .dijitButtonNode { + border-width: 1px 0px 0px 1px; + border-style: solid !important; +} diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/dijit_rtl.css b/spring-js/src/main/resources/META-INF/dijit/themes/dijit_rtl.css index 119843c0..99ac70cc 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/dijit_rtl.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/dijit_rtl.css @@ -1,25 +1,20 @@ -/* Tree */ - -.dijitRtl .dijitTreeContainer .dijitTreeExpando { - float:right; +.dj_gecko-rtl .dijitInputField { + direction: ltr; /* Firefox needs this - probably a bug */ } - -.dijitRtl .dijitTreeContainer .dijitTreeExpand { - float:right; +.dj_gecko-rtl .dijitInputField * { + direction: rtl; /* Firefox needs dijitInputField to be ltr, so fix the contained tags */ } -/* can't specify .dijitRtl and .dijit_a11y on this rule, since they are on the same node */ -.dijitRtl .dijitExpandoText { - float: right; - padding-left: 3px; - padding-right: 0; -} - /* ComboBox */ +.dijitRtl .dijitMenuItem { + text-align: right; +} + +/* Tree */ .dijitRtl .dijitComboBox .dijitInputField { border-right-width:1px !important; - border-left-width:0px !important; + border-left-width:0 !important; } /* Calendar */ @@ -33,119 +28,84 @@ } .dijitRtl .dijitProgressBarFull .dijitProgressBarLabel { - right:0px; /* FF workaround */ + right:0; /* FF workaround */ } -/* Button */ - -.dijitRtl .dijitComboButton .dijitButtonContents { - border-right-width:1px !important; -} - -/* A11y */ .dijitRtl .dijitA11ySideArrow { margin-left:1em; margin-right:0; } -/* AccordionPane */ - -.dijitRtl .dijitAccordionPane .dijitAccordionTitle .dijitAccordionArrow, -.dijitRtl .dijitAccordionPane .dijitAccordionTitle .arrowTextUp, -.dijitRtl .dijitAccordionPane .dijitAccordionTitle .arrowTextDown { - float: left; -} - /* Slider */ -.dijitRtl .dijitVerticalSliderImageHandle { +.dijitRtl .dijitSliderImageHandleV { left:auto; right:-6px; } -.dj_ie .dijitRtl .dijitVerticalSliderImageHandle { +.dj_ie-rtl .dijitSliderImageHandleV { right:-10px; } -.dijitRtl .dijitHorizontalSliderMoveable { +.dijitRtl .dijitSliderMoveableH { right:auto; left:0; } -.dijitRtl .VerticalRuleContainer { +.dijitRtl .dijitRuleContainerV { float:right; } -.dj_ie .dijitRtl .VerticalRuleContainer { +.dj_gecko-rtl .dijitRuleContainerV { + float:left; +} + +.dj_ie-rtl .dijitRuleContainerV { text-align:right; } -.dj_ie .dijitRtl .VerticalRuleLabel { +.dj_ie-rtl .dijitRuleLabelV { text-align:left; } -.dj_ie .dijitRtl .HorizontalRuleLabel { +.dj_ie-rtl .dijitRuleLabelH { zoom:1; } -.dj_ie .dijitRtl .dijitHorizontalSliderProgressBar { +.dj_ie-rtl .dijitSliderProgressBarH { right:0; left:auto; } -/* TabContainer */ - -.dijitRtl .dijitTab { +.dj_gecko-rtl .dijitSliderProgressBarH { float:right; + right:0; + left:auto; } -.dj_ie .dijitRtl .dijitTab, -.dj_ie .dijitRtl .dijitTab .dijitTabInnerDiv, -.dj_ie .dijitRtl .dijitTab .dijitTabInnerDiv span { - position:static; - zoom:1; +/* Spinner */ + +.dijitRtl .dijitSpinner .dijitInputLayoutContainer .dijitArrowButton { + right: auto; + left: 0; + border-width: 0 1px 0 0 !important; } -.dj_ie .dijitRtl .dijitTabContainer .dijitAlignLeft { - margin-left:1px !important; +.dijitRtl .dijitSpinnerButtonContainer { + float: left; } -.dj_ie .dijitRtl .dijitTabContainer .dijitAlignRight { - margin-right:1px !important; +.dijitRtl .dijit_a11y .dijitSpinnerButtonContainer { + margin-left: none; + margin-right: 2px; } -/* TabContainer */ - -.dijitRtl .dijitTab { - float:right; +.dijitRtl DIV.dijitArrowButton, .dijitRtl .dijitValidationIcon, .dijitRtl .dijitValidationIconText { + float: left; } -.dj_ie .dijitRtl .dijitTab, -.dj_ie .dijitRtl .dijitTab .dijitTabInnerDiv { - zoom:1; -} - -.dj_ie6 .dijitRtl .dijitTab { - /* force ie6 to render each tab based on the tab's label */ - width:1px; -} - -.dj_ie7 .dijitRtl .dijitTabContainer .dijitAlignLeft { - /* fix the offset between tabs and the pane */ - margin-left:1px !important; -} - -.dj_ie7 .dijitRtl .dijitTabContainer .dijitAlignRight { - /* fix the offset between tabs and the pane */ - margin-right:1px !important; -} - -.dj_ie6 .dijitRtl .dijitTabContainer .dijitAlignLeft { - overflow-x:visible; - margin-left:2px !important; -} - -.dj_ie6 .dijitRtl .dijitTabContainer .dijitAlignRight { - overflow-x:visible; - margin-right:2px !important; +/* ContentPane*/ +.dijitRtl .dijitContentPaneLoading, .dijitRtl .dijitContentPaneError { + background-position:right; + padding-right:25px; } diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Calendar.css b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Calendar.css index 76017eae..a7e5e25b 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Calendar.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Calendar.css @@ -4,10 +4,12 @@ /* next/prev month buttons */ width:15px; height:15px; - font-size: 1px; + background-image: url("images/spriteRoundedIconsSmall.png"); + background-repeat: no-repeat } .dj_ie6 .nihilo .dijitCalendarIncrementControl { - padding:.1em; + font-size:.1em; + background-image: url("images/spriteRoundedIconsSmall.gif"); } .nihilo .dijitCalendarIncreaseInner, @@ -16,17 +18,10 @@ } .nihilo .dijitCalendarDecrease { - background:url("images/spriteRoundedIconsSmall.png") no-repeat top left; + background-position: top left; } -.dj_ie6 .nihilo .dijitCalendarDecrease { - background:url("images/spriteRoundedIconsSmall.gif") no-repeat top left; -} - .nihilo .dijitCalendarIncrease { - background:url(images/spriteRoundedIconsSmall.png) no-repeat -30px top; -} -.dj_ie6 .nihilo .dijitCalendarIncrease { - background:url("images/spriteRoundedIconsSmall.gif") no-repeat -30px top; + background-position: -30px top; } .nihilo table.dijitCalendarContainer { @@ -45,8 +40,9 @@ text-align:center; } .dj_ie6 .nihilo .dijitCalendarMonthContainer th { - padding-top:.1em; - padding-bottom:0em; + padding-top:.2em; + padding-bottom:.1em; + } .nihilo .dijitCalendarDayLabelTemplate { @@ -69,22 +65,20 @@ font-weight: bold; } -.dj_ie7 .nihilo .dijitCalendarDateTemplate, -.dj_ie6 .nihilo .dijitCalendarDateTemplate { - font-size: 0.8em; -} - .nihilo .dijitCalendarDateTemplate { /* style for each day cell */ font-size: 0.9em; font-weight: bold; text-align: center; - padding: 0.3em 0.3em 0.1em 0.3em; + padding: 0.3em 0.3em 0.05em 0.3em; letter-spacing: 1px; background-color: #fdfdfd; border:#fdfdfd solid 1px !important; } +.dj_ie .nihilo .dijitCalendarDateTemplate { + padding: 0.1em .33em 0.02em .33em; +} .nihilo .dijitCalendarPreviousMonth, .nihilo .dijitCalendarNextMonth { diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Calendar_rtl.css b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Calendar_rtl.css index c72d43b5..7b29bac9 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Calendar_rtl.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Calendar_rtl.css @@ -1,16 +1,9 @@ - /* Calendar */ -.dijitRtl .dijitCalendarDecrease { +.dijitRtl .nihilo .dijitCalendarDecrease { background-position: -30px top; } -.dijitRtl .dijitCalendarIncrease { +.dijitRtl .nihilo .dijitCalendarIncrease { background-position: 0px top; } -.dj_ie6 .dijitRtl .dijitCalendarIncrease { - background-position: 0px top; -} -.dj_ie6 .dijitRtl .dijitCalendarDecrease { - background-position: -30px top; -} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Dialog.css b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Dialog.css index 91b1c235..963004ee 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Dialog.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Dialog.css @@ -1,4 +1,3 @@ - /* Dialog */ .nihilo .dijitDialog { @@ -19,7 +18,7 @@ .nihilo .dijitDialog .dijitDialogPaneContent { background: #ffffff; border:none; - border-top: 1px solid #d3d3d3; /* #cddde9; /* w/out this, an

on the top line causes a gap between the .content and .label */ + border-top: 1px solid #d3d3d3; /* w/out this, an

on the top line causes a gap between the .content and .label */ padding:10px; } @@ -27,8 +26,7 @@ .nihilo .dijitDialogTitleBar { /* outer container for the titlebar of the dialog */ background: #fafafa url("images/titleBar.png") repeat-x top left; - /* border: 1px solid #bfbfbf; */ - padding: 5px 6px 3px 2px; + padding: 5px 6px 3px 6px; cursor: move; outline:0; /* remove this line if keyboard focus on dialog startup is an issue. tab still takes you to first focusable element */ } @@ -36,14 +34,13 @@ .nihilo .dijitDialogTitle { /* typography and styling of the dialog title */ font-weight: bold; - padding: 8px 12px 8px 12px; + padding: 4px; outline:0; } .nihilo .dijitDialogCloseIcon { /* the default close icon for the dialog */ background : url("images/spriteRoundedIconsSmall.png") no-repeat right top; - float: right; position: absolute; vertical-align: middle; right: 6px; @@ -52,7 +49,7 @@ width: 15px; cursor: pointer; } -.dj_ie6 .nihilo .dijitDialogCloseIcon { +.dj_ie .nihilo .dijitDialogCloseIcon { background : url("images/spriteRoundedIconsSmall.gif") no-repeat right top; } @@ -67,7 +64,6 @@ .nihilo .dijitTooltip, .nihilo .dijitTooltipDialog { /* the outermost dom node, holding the connector and container */ - opacity: 0.95; background: transparent; /* make the area on the sides of the arrow transparent */ } @@ -94,11 +90,6 @@ background-color: #fff; border:1px solid #d3d3d3; padding:0.45em; - /* - border-radius: 6px; - -moz-border-radius: 7px; - -webkit-border-radius: 6px; - */ } .nihilo .dijitTooltipConnector { @@ -123,7 +114,7 @@ height:11px; } -.dj_ie6 .nihilo .dijitTooltipBelow .dijitTooltipConnector { +.dj_ie .nihilo .dijitTooltipBelow .dijitTooltipConnector { background-image: url("images/tooltipConnectorUp.gif"); } @@ -135,8 +126,10 @@ width:17px; height:11px; } -.dj_ie6 .nihilo .dijitTooltipAbove .dijitTooltipConnector { +.dj_ie .nihilo .dijitTooltipAbove .dijitTooltipConnector { background-image: url("images/tooltipConnectorDown.gif"); +} +.dj_ie6 .nihilo .dijitTooltipAbove .dijitTooltipConnector { bottom: -5px; } @@ -149,12 +142,12 @@ .nihilo .dijitTooltipLeft .dijitTooltipConnector { /* the arrow piece for tooltips to the left of an element, bottom borders aligned */ right: 0px; - bottom: 7px; + bottom: 3px; background:url("images/tooltipConnectorRight.png") no-repeat top left; width:11px; height:17px; } -.dj_ie6 .nihilo .dijitTooltipLeft .dijitTooltipConnector { +.dj_ie .nihilo .dijitTooltipLeft .dijitTooltipConnector { background-image: url("images/tooltipConnectorRight.gif"); } @@ -164,12 +157,12 @@ .nihilo .dijitTooltipRight .dijitTooltipConnector { /* the arrow piece for tooltips to the right of an element, bottom borders aligned */ left: 0px; - bottom: 7px; + bottom: 3px; background:url("images/tooltipConnectorLeft.png") no-repeat top left; width:11px; height:17px; } -.dj_ie6 .nihilo .dijitTooltipRight .dijitTooltipConnector { +.dj_ie .nihilo .dijitTooltipRight .dijitTooltipConnector { background-image: url("images/tooltipConnectorLeft.gif"); } diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Dialog_rtl.css b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Dialog_rtl.css index ea85d497..5e0cffc3 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Dialog_rtl.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Dialog_rtl.css @@ -1,29 +1,6 @@ /* Dialog */ -.dijitRtl .dijitDialogTitleBar .dijitDialogCloseIcon { - background-position: -60px top; - float: left; + +.dijitRtl .nihilo .dijitDialogTitleBar .dijitDialogCloseIcon { right: auto; left: 5px; } - -/*FIXME: redundant?*/ -.dj_ie6 .dijitRtl .dijitDialogTitleBar .dijitDialogCloseIcon { - background-position: -60px top; -} - - -/* ToolTip */ - -.dj_ie .dijitRtl .dijitTooltipLeft { - margin-right: 0px; - margin-left: 13px; -} - -.dj_ie .dijitRtl .dijitTooltipRight { - margin-left: 26px; - margin-right: -13px; -} - -.dj_ie .dijitRtl .dijitTooltipDialog { - zoom:1 !important; -} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Editor.css b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Editor.css index a2113a50..284131c4 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Editor.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Editor.css @@ -1,60 +1,67 @@ -.dijitIEFixedToolbar { - position:absolute; - /* top:0; */ - top: expression(eval((document.documentElement||document.body).scrollTop)); -} - -.nihilo .dijitToolbar .dijitToolbarSeparator { - background: url('images/editor.gif'); -} - -/**** ICONS *****/ - -.nihilo .dijitEditorIcon { - background-image: url('images/editor.gif'); /* editor icons sprite image */ - background-repeat: no-repeat; - width: 18px; - height: 18px; - text-align: center; -} -.nihilo .dijitEditorIconSep { background-position: 0px; } -.nihilo .dijitEditorIconBackColor { background-position: -18px; } -.nihilo .dijitEditorIconBold { background-position: -36px; } -.nihilo .dijitEditorIconCancel { background-position: -54px; } -.nihilo .dijitEditorIconCopy { background-position: -72px; } -.nihilo .dijitEditorIconCreateLink { background-position: -90px; } -.nihilo .dijitEditorIconCut { background-position: -108px; } -.nihilo .dijitEditorIconDelete { background-position: -126px; } -.nihilo .dijitEditorIconForeColor { background-position: -144px; } -.nihilo .dijitEditorIconHiliteColor { background-position: -162px; } -.nihilo .dijitEditorIconIndent { background-position: -180px; } -.nihilo .dijitEditorIconInsertHorizontalRule { background-position: -198px; } -.nihilo .dijitEditorIconInsertImage { background-position: -216px; } -.nihilo .dijitEditorIconInsertOrderedList { background-position: -234px; } -.nihilo .dijitEditorIconInsertTable { background-position: -252px; } -.nihilo .dijitEditorIconInsertUnorderedList { background-position: -270px; } -.nihilo .dijitEditorIconItalic { background-position: -288px; } -.nihilo .dijitEditorIconJustifyCenter { background-position: -306px; } -.nihilo .dijitEditorIconJustifyFull { background-position: -324px; } -.nihilo .dijitEditorIconJustifyLeft { background-position: -342px; } -.nihilo .dijitEditorIconJustifyRight { background-position: -360px; } -.nihilo .dijitEditorIconLeftToRight { background-position: -378px; } -.nihilo .dijitEditorIconListBulletIndent { background-position: -396px; } -.nihilo .dijitEditorIconListBulletOutdent { background-position: -414px; } -.nihilo .dijitEditorIconListNumIndent { background-position: -432px; } -.nihilo .dijitEditorIconListNumOutdent { background-position: -450px; } -.nihilo .dijitEditorIconOutdent { background-position: -468px; } -.nihilo .dijitEditorIconPaste { background-position: -486px; } -.nihilo .dijitEditorIconRedo { background-position: -504px; } -.nihilo .dijitEditorIconRemoveFormat { background-position: -522px; } -.nihilo .dijitEditorIconRightToLeft { background-position: -540px; } -.nihilo .dijitEditorIconSave { background-position: -558px; } -.nihilo .dijitEditorIconSpace { background-position: -576px; } -.nihilo .dijitEditorIconStrikethrough { background-position: -594px; } -.nihilo .dijitEditorIconSubscript { background-position: -612px; } -.nihilo .dijitEditorIconSuperscript { background-position: -630px; } -.nihilo .dijitEditorIconUnderline { background-position: -648px; } -.nihilo .dijitEditorIconUndo { background-position: -666px; } -.nihilo .dijitEditorIconWikiword { background-position: -684px; } -.nihilo .dijitEditorIconToggleDir { background-position: -540px; /* padding: 0; margin: 0; color:#555555; - font-family:verdana,arial,sans-serif; font-weight: 800; font-size: 70%; */} +.dijitIEFixedToolbar { + position:absolute; + /* top:0; */ + top: expression(eval((document.documentElement||document.body).scrollTop)); +} + +.nihilo .dijitToolbar .dijitToolbarSeparator { + background: url('images/editor.gif'); +} + +/**** ICONS *****/ + +.nihilo .dijitEditorIcon { + background-image: url('images/editor.gif'); /* editor icons sprite image */ + background-repeat: no-repeat; + width: 18px; + height: 18px; + text-align: center; +} +.nihilo .dijitDisabled .dijitEditorIcon { + background-image: url('images/editorDisabled.gif'); /* editor icons sprite image */ +} + +.nihilo .dijitEditorIconSep { background-position: 0px; } +.nihilo .dijitEditorIconBackColor { background-position: -18px; } +.nihilo .dijitEditorIconBold { background-position: -36px; } +.nihilo .dijitEditorIconCancel { background-position: -54px; } +.nihilo .dijitEditorIconCopy { background-position: -72px; } +.nihilo .dijitEditorIconCreateLink { background-position: -90px; } +.nihilo .dijitEditorIconCut { background-position: -108px; } +.nihilo .dijitEditorIconDelete { background-position: -126px; } +.nihilo .dijitEditorIconForeColor { background-position: -144px; } +.nihilo .dijitEditorIconHiliteColor { background-position: -162px; } +.nihilo .dijitEditorIconIndent { background-position: -180px; } +.nihilo .dijitEditorIconInsertHorizontalRule { background-position: -198px; } +.nihilo .dijitEditorIconInsertImage { background-position: -216px; } +.nihilo .dijitEditorIconInsertOrderedList { background-position: -234px; } +.nihilo .dijitEditorIconInsertTable { background-position: -252px; } +.nihilo .dijitEditorIconInsertUnorderedList { background-position: -270px; } +.nihilo .dijitEditorIconItalic { background-position: -288px; } +.nihilo .dijitEditorIconJustifyCenter { background-position: -306px; } +.nihilo .dijitEditorIconJustifyFull { background-position: -324px; } +.nihilo .dijitEditorIconJustifyLeft { background-position: -342px; } +.nihilo .dijitEditorIconJustifyRight { background-position: -360px; } +.nihilo .dijitEditorIconLeftToRight { background-position: -378px; } +.nihilo .dijitEditorIconListBulletIndent { background-position: -396px; } +.nihilo .dijitEditorIconListBulletOutdent { background-position: -414px; } +.nihilo .dijitEditorIconListNumIndent { background-position: -432px; } +.nihilo .dijitEditorIconListNumOutdent { background-position: -450px; } +.nihilo .dijitEditorIconOutdent { background-position: -468px; } +.nihilo .dijitEditorIconPaste { background-position: -486px; } +.nihilo .dijitEditorIconRedo { background-position: -504px; } +.nihilo .dijitEditorIconRemoveFormat { background-position: -522px; } +.nihilo .dijitEditorIconRightToLeft { background-position: -540px; } +.nihilo .dijitEditorIconSave { background-position: -558px; } +.nihilo .dijitEditorIconSpace { background-position: -576px; } +.nihilo .dijitEditorIconStrikethrough { background-position: -594px; } +.nihilo .dijitEditorIconSubscript { background-position: -612px; } +.nihilo .dijitEditorIconSuperscript { background-position: -630px; } +.nihilo .dijitEditorIconUnderline { background-position: -648px; } +.nihilo .dijitEditorIconUndo { background-position: -666px; } +.nihilo .dijitEditorIconWikiword { background-position: -684px; } +.nihilo .dijitEditorIconToggleDir { background-position: -540px; /* padding: 0; margin: 0; color:#555555; + font-family:verdana,arial,sans-serif; font-weight: 800; font-size: 70%; */} +.nihilo .dijitEditorIconTabIndent { background-position: -702px; } +.nihilo .dijitEditorIconSelectAll { background-position: -720px; } +.nihilo .dijitEditorIconUnlink { background-position: -738px; } \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Editor_rtl.css b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Editor_rtl.css index e834b525..81da4bef 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Editor_rtl.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Editor_rtl.css @@ -1,11 +1,13 @@ /* Editor */ -.dijitRtl .dijitEditorIcon { +.dijitRtl .nihilo .dijitEditorIcon { background-image: url('images/editor_rtl.gif'); /* editor icons sprite image */ } - +.dijitRtl .nihilo .dijitDisabled .dijitEditorIcon { + background-image: url('images/editorDisabled_rtl.gif'); /* editor icons sprite image */ +} /* Toolbar */ -.dijitRtl .dijitToolbar .dijitToolbarSeparator { +.dijitRtl .nihilo .dijitToolbar .dijitToolbarSeparator { background-image: url('images/editor_rtl.gif'); } diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Menu.css b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Menu.css index 5709ea5c..e31cfa4b 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Menu.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Menu.css @@ -9,7 +9,7 @@ .nihilo .dijitMenuItem { background-color: #fff; - font: menu; + font-family: sans-serif; margin: 0px; color: #243C5F; } @@ -32,21 +32,17 @@ } .nihilo .dijitMenuExpand { - display:none; -} -.nihilo .dijitMenuExpandEnabled { /* margin-top:4px; */ width:15px; height:15px; - background:url('images/spriteRoundedIconsSmall.png') no-repeat -30px top; + background-image: url('images/spriteRoundedIconsSmall.png'); + background-repeat: no-repeat; + background-position: -30px top; display:block; } -.dj_ie6 .nihilo .dijitMenuExpandEnabled { +.dj_ie6 .nihilo .dijitMenuExpand { background-image:url('images/spriteRoundedIconsSmall.gif'); } -.nihilo .dijitMenuExpandInner { - display:none; -} .nihilo .dijitMenuSeparator { background-color: #fff; @@ -60,4 +56,26 @@ .nihilo .dijitMenuSeparatorBottom { border-top: 1px solid #d3d3d3; +} + +/* the checked menu item */ +.nihilo .dijitCheckedMenuItemIconChar { + display: none; +} + +.nihilo .dijitCheckedMenuItemIcon { + background-image: url('images/spriteCheckbox.gif'); + background-position: -16px; +} + +.nihilo .dijitCheckedMenuItemIconChecked { + background-position: 0px; +} + +.nihilo .dijitMenuItemHover .dijitCheckedMenuItemIcon { + background-position: -80px; +} + +.nihilo .dijitMenuItemHover .dijitCheckedMenuItemIconChecked { + background-position: -64px; } \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Menu_rtl.css b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Menu_rtl.css index ac66852f..f07fbd6f 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Menu_rtl.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Menu_rtl.css @@ -1,15 +1,10 @@ - /* Menu */ -.dijitRtl .dijitMenuItem .dijitMenuItemIcon { +.dijitRtl .nihilo .dijitMenuItem .dijitMenuItemIcon { padding-left: 3px; padding-right: 0px; } -.dijitRtl .dijitMenuItem .dijitMenuExpandEnabled { - background-image:url('images/arrowLeft.png'); -} - -.dj_ie6 .dijitRtl .dijitMenuItem .dijitMenuExpandEnabled { - background-image:url('images/arrowLeft.gif'); -} +.dijitRtl .nihilo .dijitMenuItem .dijitMenuExpand { + background-position: 0px top; +} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/TimePicker.css b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/TimePicker.css new file mode 100644 index 00000000..f40d3d41 --- /dev/null +++ b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/TimePicker.css @@ -0,0 +1,61 @@ +/* Time Picker */ +.nihilo .dijitTimePickerTick, +.nihilo .dijitTimePickerMarker { + border-color: #eeeeee; +} + +.nihilo .dijitTimePickerTick { + color:white; +} + +.nihilo .dijitTimePickerMarker { + background:#d3d3d3 url("images/titleBar.png") repeat-x top; + color:#293a4b; + font-weight: bold; +} + +.nihilo .dijitTimePickerItemSelected { + color: black; + background: #ffe284 none; +} + +.nihilo .dijitTimePickerItemHover { + background: #d6d6dd none; + color:black; +} + +.nihilo .dijitTimePickerItemHover, +.nihilo .dijitTimePickerItemSelected { + position: relative; + z-index: 10; +} + +.nihilo .dijitTimePickerTick .dijitTimePickerItemInner { + font-size:0.4em; +} + +.nihilo .dijitTimePickerItemHover .dijitTimePickerItemInner, +.nihilo .dijitTimePickerItemSelected .dijitTimePickerItemInner { + font-size:1em; +} + +.nihilo .dijitTimePickerMarkerHover { + border-top: 1px solid #eeeeee; +} + +.nihilo .dijitTimePickerTickHover, +.nihilo .dijitTimePickerTickSelected { + margin-top:-0.3em; + margin-bottom:-0.3em; + border-bottom: none; +} + +.dijit_a11y .dijitTimePickerTickHover { + background-color: #CCC !important; + border-top: 1px solid #333 !important; + border-bottom: 1px solid #333 !important; +} + +.dijit_a11y .dijitTimePickerMarkerHover { + border-bottom-width: 2px; +} diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/TitlePane.css b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/TitlePane.css index 9b191b92..aa886d25 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/TitlePane.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/TitlePane.css @@ -7,35 +7,35 @@ background: #cccccc; background:#fff url("images/titleBar.png") repeat-x top left; border:1px solid #bfbfbf; - padding:4px 4px 2px 4px; + padding:3px 4px; cursor: pointer; font-size: 0.9em; font-weight: bold; color: #6d6d6d; } -/* TODO: merge these, and all other icons to a series of background-image:() and background-position: -16*n px styles */ +.nihilo .dijitTitlePaneTitle * { + vertical-align: middle; +} + .nihilo .dijitTitlePane .dijitArrowNode { width:15px; height:15px; - float:right; - margin-top: -2px; } .nihilo .dijitTitlePaneFocused .dijitTitlePaneTextNode { color: #243C5F; } - .nihilo .dijitOpen .dijitTitlePaneTextNode { color: #243C5F; } .nihilo .dijitTitlePane .dijitClosed .dijitArrowNode { - background: url('images/spriteRoundedIconsSmall.png') no-repeat top left; + background: url('images/spriteRoundedIconsSmall.png') no-repeat -30px top; } .dj_ie6 .nihilo .dijitTitlePane .dijitClosed .dijitArrowNode { - background:url('images/spriteRoundedIconsSmall.gif') no-repeat top left; + background:url('images/spriteRoundedIconsSmall.gif') no-repeat -30px top; } .nihilo .dijitTitlePane .dijitOpen .dijitArrowNode { background:url('images/spriteRoundedIconsSmall.png') no-repeat -15px top; @@ -44,19 +44,18 @@ background:url('images/spriteRoundedIconsSmall.gif') no-repeat -15px top; } .nihilo .dijitTitlePane .dijitArrowNodeInner { - visibility:hidden; + display:none; } + .dijit_a11y .dijitTitlePane .dijitArrowNodeInner { - visibility:visible; + display:inline !important; + font-family:monospace; + cursor: pointer; + padding-bottom:.2em; } -.nihilo .dijitTitlePaneTitle .dijitOpenCloseArrowOuter { - margin-right:5px; -} - -.nihilo .dijitOpen .dijitTitlePaneTitle .dijitOpenCloseArrowOuter { - position:relative; - top:2px; +.dijit_a11y .dijitTitlePane .dijitArrowNode { + display:none; } .nihilo .dijitTitlePaneContentOuter { @@ -72,6 +71,8 @@ .dj_ie6 .nihilo .dijitTitlePane .dijitTitlePaneTitle { zoom: 1; } -.nihilo .dijitClickableRegion { - background-color : #ffc !important; + +.nihilo .dijitTitlePaneTextNode { + margin-left: 4px; + margin-right: 4px; } \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/TitlePane_rtl.css b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/TitlePane_rtl.css index 52286bcd..50a5d433 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/TitlePane_rtl.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/TitlePane_rtl.css @@ -1,6 +1,6 @@ -.dijitRtl .dijitTitlePane .dijitClosed .dijitArrowNode { - background-position: -30px top; +.dijitRtl .nihilo .dijitTitlePane .dijitClosed .dijitArrowNode { + background-position: 0px top; } -.dj_ie6 .dijitRtl .dijitTitlePane .dijitClosed .dijitArrowNode { - background-position: -30px top; +.dj_ie6-rtl .nihilo .dijitTitlePane .dijitClosed .dijitArrowNode { + background-position: 0px top; } \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Toolbar.css b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Toolbar.css index 1f932f21..d9af69ca 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Toolbar.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Toolbar.css @@ -1,32 +1,37 @@ .nihilo .dijitToolbar { - padding: 3px 0 1px 3px; border-bottom: 1px solid #ccc; background:#eaeaea url("images/titleBar.png") repeat-x top left; } -.nihilo .dijitToolbar .dijitButtonNode { +/* setting a min-height on ditor toolbar */ +.dj_ie6 .nihilo .dijitToolbar { + height: 10px; +} + +.nihilo .dijitToolbar .dijitButtonNode, +.nihilo .dijitToolbar .dijitComboButton .dijitButtonContents, +.nihilo .dijitToolbar .dijitComboButton .dijitDownArrowButton { background: none; - margin: 0px !important; - padding: 0px !important; + margin: 0px; + padding: 0px; border: none; font-size: 12px; } .nihilo .dijitToolbar .dijitButton, .nihilo .dijitToolbar .dijitToggleButton, -.nihilo .dijitToolbar .dijitDropDownButton { - background: none; - margin: 1px; - padding: 0px; - border: 1px solid transparent; +.nihilo .dijitToolbar .dijitDropDownButton, +.nihilo .dijitToolbar .dijitComboButton .dijitButtonContents, +.nihilo .dijitToolbar .dijitComboButton .dijitDownArrowButton { + background: none; + padding: 1px; /* on hover etc., margin replaced w/border */ } .nihilo .dijitToolbar .dijitButtonChecked, .nihilo .dijitToolbar .dijitToggleButtonChecked { background-color:#ffeeb9; border:1px solid #f7c95c; - margin: 1px !important; - padding: 0px !important; + padding: 0; } .nihilo .dijitToolbar .dijitButtonCheckedHover, @@ -34,15 +39,17 @@ { background-color:#ffe284; border:1px solid #f7c95c; - margin: 1px !important; - padding: 0px !important; + padding: 0; } .nihilo .dijitToolbar .dijitButtonHover, .nihilo .dijitToolbar .dijitToggleButtonHover, -.nihilo .dijitToolbar .dijitDropDownButtonHover { +.nihilo .dijitToolbar .dijitDropDownButtonHover, +.nihilo .dijitToolbar .dijitComboButtonHover .dijitButtonContents, +.nihilo .dijitToolbar .dijitComboButtonDownArrowHover .dijitDownArrowButton { /* TODO: change this from Hover to Selected so that button is still highlighted while drop down is being used */ border: 1px solid #f7c95c; + padding: 0; background-color:#ffe284; } @@ -54,42 +61,7 @@ .dj_ie .nihilo .dijitToolbar .dijitComboButton .dijitDownArrowButtonFocused, .dj_ff2 .nihilo.dijitToolbar .dijitComboButton .dijitButtonContentsFocused, .dj_ff2 .nihilo .dijitToolbar .dijitComboButton .dijitDownArrowButtonFocused { - border: 1px black dotted !important; -} - -/* IE6 specific rules */ -.dj_ie6 .nihilo .dijitToolbar .dijitButton, -.dj_ie6 .nihilo .dijitToolbar .dijitToggleButton, -.dj_ie6 .nihilo .dijitToolbar .dijitDropDownButton { - /* workaround no transparent border support in IE6 */ - margin: 2px; - padding: 0px 2px; - border: 0px; -} - -.dj_ie6 .nihilo .dijitToolbar .dijitButtonChecked, -.dj_ie6 .nihilo .dijitToolbar .dijitToggleButtonChecked, -.dj_ie6 .nihilo .dijitToolbar .dijitDropDownButtonChecked { - background-color:#ffeeb9; - border:1px solid #f7c95c; - margin: 1px !important; - padding: 0px 2px !important; -} - -.dj_ie6 .nihilo .dijitToolbar .dijitButtonCheckedHover, -.dj_ie6 .nihilo .dijitToolbar .dijitToggleButtonCheckedHover, -.dj_ie6 .nihilo .dijitToolbar .dijitDropDownButtonCheckedHover { - background-color:#ffe284; - border:1px solid #f7c95c; - margin: 1px !important; - padding: 0px 2px !important; -} - -.dj_ie6 .nihilo .dijitToolbar .dijitButtonHover, -.dj_ie6 .nihilo .dijitToolbar .dijitToggleButtonHover, -.dj_ie6 .nihilo .dijitToolbar .dijitDropDownButtonHover { - background-color:#ffe284; - border:1px solid #f7c95c; - margin: 1px !important; - padding: 0px 2px !important; + /* focus border doesn't appear on

for FF2 or IE, so need to add it manually */ + border: 1px #555 dotted !important; + padding: 0px; } \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Tree.css b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Tree.css index 6437e92e..41222148 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Tree.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Tree.css @@ -32,8 +32,6 @@ .nihilo .dijitTreeContent { min-height: 18px; min-width: 18px; - margin-left:18px; - padding-top:3px; padding-left:1px; } diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Tree_rtl.css b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Tree_rtl.css index a35d56d6..d2b81e1d 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Tree_rtl.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/Tree_rtl.css @@ -1,38 +1,36 @@ /* Tree */ -.dijitRtl .dijitTreeContainer .dijitTreeNode { +.dijitRtl .nihilo .dijitTreeContainer .dijitTreeNode { background-image : url('images/treeI_rtl.gif'); background-position : top right; margin-left: auto; margin-right: 19px; } -.dijitRtl .dijitTreeContainer .dijitTreeIsRoot { +.dijitRtl .nihilo .dijitTreeContainer .dijitTreeIsRoot { margin-left: auto; margin-right: 0; background-image: none; } -.dijitRtl .dijitTreeContainer .dijitTreeIsLast { +.dijitRtl .nihilo .dijitTreeContainer .dijitTreeIsLast { background-image: url('images/treeI_half_rtl.gif'); } -.dijitRtl .dijitTreeContainer .dijitTreeContent { - margin-left: auto; - margin-right: 18px; +.dijitRtl .nihilo .dijitTreeContainer .dijitTreeContent { padding-left: auto; padding-right: 1px; } -.dijitRtl .dijitTreeContainer .dijitTreeExpandoOpened { +.dijitRtl .nihilo .dijitTreeContainer .dijitTreeExpandoOpened { background: url('images/spriteTree_rtl.gif') no-repeat -18px top; } -.dijitRtl .dijitTreeContainer .dijitTreeExpandoClosed { +.dijitRtl .nihilo .dijitTreeContainer .dijitTreeExpandoClosed { background-image: url('images/spriteTree_rtl.gif'); } -.dijitRtl .dijitTreeContainer .dijitTreeExpandoLeaf { +.dijitRtl .nihilo .dijitTreeContainer .dijitTreeExpandoLeaf { background: url('images/spriteTree_rtl.gif') no-repeat -36px top; } \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/form/Button.css b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/form/Button.css index 880b89bc..8039a60b 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/form/Button.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/form/Button.css @@ -11,15 +11,17 @@ /* border:1px outset #a0a0a0; */ border:1px solid #dedede; border-bottom:1px solid #dedede; - border-right:1px solid #dedede; - padding: 0.2em; - background:#fff url("../images/buttonEnabled.png") repeat-x top left; -} -.dj_ie .nihilo .dijitButtonNode { - zoom: 1; + padding: 0.1em 0.2em 0.2em 0.2em; + background: #fff url("../images/buttonEnabled.png") repeat-x top left; } +.nihilo .dijitButtonNode button { + border: 0px; + background-color: transparent; +} + .nihilo .dijitButtonText { + text-align: center; padding: 0 0.3em; } @@ -49,19 +51,12 @@ .nihilo .dijitSpinnerDisabled .dijitButtonNode { /* disabled state - inner */ border-color: #dedede; - /*color:#b4b4b4;*/ background:#fafafa url("../images/buttonDisabled.png") top repeat-x; opacity: 0.60; /* Safari, Opera and Mozilla */ } -.dj_ie .nihilo .dijitButtonDisabled .dijitButtonNode *, -.dj_ie .nihilo .dijitToggleButtonDisabled .dijitButtonNode *, -.dj_ie .nihilo .dijitDropDownButtonDisabled .dijitButtonNode *, -.dj_ie .nihilo .dijitComboButtonDisabled .dijitButtonNode *, -.dj_ie .nihilo .dijitSpinnerDisabled .dijitButtonNode * { - filter: gray() alpha(opacity=50); /* IE */ -} .nihilo .dijitButtonHover .dijitButtonNode, +.nihilo .dijitButtonNodeHover, .nihilo .dijitToggleButtonHover .dijitButtonNode, .nihilo .dijitDropDownButtonHover .dijitButtonNode, .nihilo .dijitComboButtonHover .dijitButtonContents, @@ -71,7 +66,7 @@ .nihilo .dijitSpinnerDownArrowHover .dijitDownArrowButton { /* hover state - inner */ /* TODO: change from Hover to Selected so that button is still highlighted while drop down is being used */ - color:#000; + color:#243C5F; background:#fcfcfc url("../images/buttonHover.png") repeat-x top left; } @@ -106,4 +101,4 @@ .dj_ie6 .nihilo .dijitUpArrowButton .dijitArrowButtonInner { background:url("../images/spriteArrows.gif") no-repeat -22px top; width: 11px; -} \ No newline at end of file +} diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/form/Button_rtl.css b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/form/Button_rtl.css index a99cc721..57edd702 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/form/Button_rtl.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/form/Button_rtl.css @@ -1,3 +1,3 @@ -.dijitRtl .dijitComboBox .dijitButtonNode { +.dijitRtl .nihilo .dijitComboBox .dijitButtonNode { border-width: 0px 0px 0px 1px; } \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/form/Checkbox.css b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/form/Checkbox.css index c77871bc..b35ebf35 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/form/Checkbox.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/form/Checkbox.css @@ -56,14 +56,12 @@ background-position: -32px; } -.nihilo .dijitCheckBoxHover, -.nihilo .dijitCheckBoxFocused { +.nihilo .dijitCheckBoxHover { /* hovering over an unchecked enabled checkbox */ background-position: -80px; } -.nihilo .dijitCheckBoxCheckedHover, - .nihilo .dijitCheckBoxCheckedFocused { +.nihilo .dijitCheckBoxCheckedHover { /* hovering over a checked enabled checkbox */ background-position: -64px; } \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/form/ComboBox.css b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/form/ComboBox.css index 92e53758..1e3a4db3 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/form/ComboBox.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/form/ComboBox.css @@ -2,6 +2,11 @@ background:url("../images/spriteArrows.png") no-repeat left center; width: 11px; } + +.dj_ie6 .nihilo .dijitComboBox .dijitArrowButton .dijitArrowButtonInner { + background:url("../images/spriteArrows.gif") no-repeat left center; +} + .nihilo .dijitComboBoxHover .dijitArrowButtonInner { /* TODO: url("images/arrowDownHover.png") but in IE6 it flickers some? */ } \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/form/Common.css b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/form/Common.css index 39aa1a6e..6498c70e 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/form/Common.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/form/Common.css @@ -27,11 +27,18 @@ Otherwise the actual input element. */ background:#fff url("../images/validationInputBg.png") repeat-x top left; - #background:#fff url('../images/validationInputBg.gif') repeat-x top left; border:1px solid #d3d3d3; line-height: normal; } +.dj_ie6 .nihilo .dijitTextBox, +.dj_ie6 .nihilo .dijitComboBox, +.dj_ie6 .nihilo .dijitSpinner, +.dj_ie6 .nihilo .dijitInlineEditor input, +.dj_ie6 .nihilo .dijitTextArea { + background:#fff url('../images/validationInputBg.gif') repeat-x top left; +} + .nihilo .dijitComboBox .dijitButtonNode { padding: 0 0.2em; } @@ -42,9 +49,23 @@ border-left: 1px solid #d3d3d3; } +.nihilo .dijitTextBoxDisabled, +.nihilo .dijitComboBoxDisabled, +.nihilo .dijitSpinnerDisabled, +.nihilo .dijitTextAreaDisabled { + color: gray; +} +.dj_safari .nihilo .dijitTextBoxDisabled, +.dj_safari .nihilo .dijitComboBoxDisabled, +.dj_safari .nihilo .dijitSpinnerDisabled, +.dj_safari .nihilo .dijitTextareaDisabled { + color: #eee; +} + .nihilo .dijitTextBoxFocused, .nihilo .dijitComboBoxFocused, -.nihilo .dijitSpinnerFocused { +.nihilo .dijitSpinnerFocused, +.nihilo .dijitTextAreaFocused { /* input field when focused (ie: typing affects it) */ border-color:#b3b3b3; } @@ -80,3 +101,8 @@ width: 16px; background: transparent url('../images/warning.png') no-repeat center center; } + +/* The highlight is shown in the ComboBox menu. */ +.nihilo .dijitComboBoxHighlightMatch { + background-color:#d3d3d3; +} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/form/Common_rtl.css b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/form/Common_rtl.css index 22d6b34b..f86c9fab 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/form/Common_rtl.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/form/Common_rtl.css @@ -1,5 +1,5 @@ -.dijitRtl .dijitComboBox .dijitButtonNode, -.dijitRtl .dijitSpinner .dijitButtonNode { +.dijitRtl .nihilo .dijitComboBox .dijitButtonNode, +.dijitRtl .nihilo .dijitSpinner .dijitButtonNode { /* line between the input area and the drop down button */ border-color: #8ba0bd; border-left: 0px solid #8ba0bd; diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/form/RadioButton.css b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/form/RadioButton.css index 38f3741a..074d7db4 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/form/RadioButton.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/form/RadioButton.css @@ -55,14 +55,12 @@ background-position: -32px; } -.nihilo .dijitRadioHover, -.nihilo .dijitRadioFocused { +.nihilo .dijitRadioHover { /* hovering over an unselected enabled radio button */ background-position: -80px; } -.nihilo .dijitRadioCheckedHover, -.nihilo .dijitRadioCheckedFocused { +.nihilo .dijitRadioCheckedHover { /* hovering over a selected enabled radio button */ background-position: -64px; } \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/form/Slider.css b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/form/Slider.css index c7a7ca21..6fbb8606 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/form/Slider.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/form/Slider.css @@ -1,136 +1,138 @@ - -/**** - SLIDER -****/ - -.nihilo .dijitSliderProgressBarH { - border-color: #aab0bb; - background: #c0c2c5 url("../images/sliderFull.png") repeat-x top left; -} - -.nihilo .dijitSliderProgressBarV { - border-color: #aab0bb; - background: #c0c2c5 url("../images/sliderFullVertical.png") repeat-y bottom left; -} - -.nihilo .dijitSliderFocused .dijitSliderProgressBarH, -.nihilo .dijitSliderFocused .dijitSliderLeftBumper { - background-image:url("../images/sliderFullFocus.png"); -} - -.nihilo .dijitSliderFocused .dijitSliderProgressBarV, -.nihilo .dijitSliderFocused .dijitSliderBottomBumper { - background-image:url("../images/sliderFullVerticalFocus.png"); -} - -.nihilo .dijitSliderRemainingBarV { - border-color: #b4b4b4; - background: #dcdcdc url("../images/sliderEmptyVertical.png") repeat-y bottom left; -} - -.nihilo .dijitSliderRemainingBarH { - border-color: #b4b4b4; - background: #dcdcdc url("../images/sliderEmpty.png") repeat-x top left; -} - -.nihilo .dijitSliderBar { - border-style: solid; - outline:1px; - /* border-color: #b4b4b4; */ -} -.nihilo .dijitSliderFocused .dijitSliderBar { - border-color:#727272; -} - -.dijit_a11y .dijitSliderProgressBar { - background-color:#333 !important; -} - -.nihilo .dijitSliderImageHandleH { - border:0px; - width:15px; - height:18px; - background:url("../images/preciseSliderThumb.png") no-repeat center top; - cursor:pointer; -} -.nihilo .dijitSliderFocused .dijitSliderImageHandleH { - background-image:url("../images/preciseSliderThumbFocus.png"); - #background-image:url("../images/preciseSliderThumbFocus.gif"); -} - -.dj_ie6 .nihilo .dijitSliderImageHandleH { - background-image:url("../images/preciseSliderThumb.gif"); -} - -.nihilo .dijitSliderLeftBumper { - border-left-width: 1px; - border-color: #aab0bb; - background: #c0c2c5 url("../images/sliderFull.png") repeat-x top left; -} - -.nihilo .dijitSliderRightBumper { - background: #dcdcdc url("../images/sliderEmpty.png") repeat-x top left; - border-color: #b4b4b4; - border-right-width: 1px; -} - -.nihilo .dijitSliderImageHandleV { - border:0px; - width:20px; - height:15px; - background:url("../images/sliderThumb.png") no-repeat center center; - cursor:pointer; -} - -.nihilo .dijitSliderFocused .dijitSliderImageHandleV { - background-image:url("../images/sliderThumbFocus.png"); -} -.dj_ie6 .nihilo .dijitSliderFocused .dijitSliderImageHandleV { - background-image:url("../images/sliderThumbFocus.gif"); -} - -.nihilo .dijitSliderBottomBumper { - border-bottom-width: 1px; - border-color: #aab0bb; - background: #c0c2c5 url("../images/sliderFullVertical.png") repeat-y bottom left; -} - -.nihilo .dijitSliderTopBumper { - background: #dcdcdc url("../images/sliderEmptyVertical.png") repeat-y top left; - border-color: #b4b4b4; - border-top-width: 1px; -} - -.nihilo .dijitSliderIncrementIconH, -.nihilo .dijitSliderIncrementIconV { - background:url('../images/spriteRoundedIconsSmall.png') no-repeat -45px top; - width:15px; height:15px; - cursor:pointer; -} -.nihilo .dijitSliderIncrementIconH { - background:url('../images/spriteRoundedIconsSmall.png') no-repeat -30px top; -} - -.nihilo .dijitSliderDecrementIconH, -.nihilo .dijitSliderDecrementIconV { - width:15px; - height:15px; - cursor:pointer; - background:url('../images/spriteRoundedIconsSmall.png') no-repeat -15px top; -} -.nihilo .dijitSliderDecrementIconH { background:url('../images/spriteRoundedIconsSmall.png') no-repeat 0px top; } - -.nihilo .dijitSliderButtonInner { - visibility:hidden; -} - -.nihilo .dijitSliderDisabled { - opacity:0.6 !important; -} - -.dj_ie6 .nihilo .dijitSliderDisabled, -.dj_ie6 .nihilo .dijitSliderDisabled .dijitRuleContainer, -.dj_ie6 .nihilo .dijitSliderDisabled .dijitSliderRemainingBar, -.dj_ie6 .nihilo .dijitSliderDisabled .dijitSliderProgressBar { - filter: gray() alpha(opacity=40); + +/**** + SLIDER +****/ + +.nihilo .dijitSliderProgressBarH { + border-color: #aab0bb; + background: #c0c2c5 url("../images/sliderFull.png") repeat-x top left; +} + +.nihilo .dijitSliderProgressBarV { + border-color: #aab0bb; + background: #c0c2c5 url("../images/sliderFullVertical.png") repeat-y bottom left; +} + +.nihilo .dijitSliderFocused .dijitSliderProgressBarH, +.nihilo .dijitSliderFocused .dijitSliderLeftBumper { + background-image:url("../images/sliderFullFocus.png"); +} + +.nihilo .dijitSliderFocused .dijitSliderProgressBarV, +.nihilo .dijitSliderFocused .dijitSliderBottomBumper { + background-image:url("../images/sliderFullVerticalFocus.png"); +} + +.nihilo .dijitSliderRemainingBarV { + border-color: #b4b4b4; + background: #dcdcdc url("../images/sliderEmptyVertical.png") repeat-y bottom left; +} + +.nihilo .dijitSliderRemainingBarH { + border-color: #b4b4b4; + background: #dcdcdc url("../images/sliderEmpty.png") repeat-x top left; +} + +.nihilo .dijitSliderBar { + border-style: solid; + outline:1px; + /* border-color: #b4b4b4; */ +} +.nihilo .dijitSliderFocused .dijitSliderBar { + border-color:#727272; +} + +.dijit_a11y .dijitSliderProgressBar { + background-color:#333 !important; +} + +.nihilo .dijitSliderImageHandleH { + border:0px; + width:15px; + height:18px; + background:url("../images/preciseSliderThumb.png") no-repeat center top; + #background:url("../images/preciseSliderThumb.gif") no-repeat center top; + cursor:pointer; +} +.nihilo .dijitSliderFocused .dijitSliderImageHandleH { + background-image:url("../images/preciseSliderThumbFocus.png"); + #background-image:url("../images/preciseSliderThumbFocus.gif"); +} + +.nihilo .dijitSliderLeftBumper { + border-left-width: 1px; + border-color: #aab0bb; + background: #c0c2c5 url("../images/sliderFull.png") repeat-x top left; +} + +.nihilo .dijitSliderRightBumper { + background: #dcdcdc url("../images/sliderEmpty.png") repeat-x top left; + border-color: #b4b4b4; + border-right-width: 1px; +} + +.nihilo .dijitSliderImageHandleV { + border:0px; + width:20px; + height:15px; + background:url("../images/sliderThumb.png") no-repeat center center; + #background:url("../images/sliderThumb.gif") no-repeat center center; + cursor:pointer; +} + +.nihilo .dijitSliderFocused .dijitSliderImageHandleV { + background-image:url("../images/sliderThumbFocus.png"); + #background-image:url("../images/sliderThumbFocus.gif"); +} + +.nihilo .dijitSliderBottomBumper { + border-bottom-width: 1px; + border-color: #aab0bb; + background: #c0c2c5 url("../images/sliderFullVertical.png") repeat-y bottom left; +} + +.nihilo .dijitSliderTopBumper { + background: #dcdcdc url("../images/sliderEmptyVertical.png") repeat-y top left; + border-color: #b4b4b4; + border-top-width: 1px; +} + +.nihilo .dijitSliderIncrementIconH, +.nihilo .dijitSliderIncrementIconV { + background:url('../images/spriteRoundedIconsSmall.png') no-repeat -45px top; + #background:url('../images/spriteRoundedIconsSmall.gif') no-repeat -45px top; + width:15px; height:15px; + cursor:pointer; +} +.nihilo .dijitSliderIncrementIconH { + background:url('../images/spriteRoundedIconsSmall.png') no-repeat -30px top; + #background:url('../images/spriteRoundedIconsSmall.gif') no-repeat -30px top; +} + +.nihilo .dijitSliderDecrementIconH, +.nihilo .dijitSliderDecrementIconV { + width:15px; + height:15px; + cursor:pointer; + background:url('../images/spriteRoundedIconsSmall.png') no-repeat -15px top; + #background:url('../images/spriteRoundedIconsSmall.gif') no-repeat -15px top; +} +.nihilo .dijitSliderDecrementIconH { + background:url('../images/spriteRoundedIconsSmall.png') no-repeat 0px top; + #background:url('../images/spriteRoundedIconsSmall.gif') no-repeat 0px top; +} + +.nihilo .dijitSliderButtonInner { + visibility:hidden; +} + +.nihilo .dijitSliderDisabled { + opacity:0.6 !important; +} + +.dj_ie6 .nihilo .dijitSliderDisabled, +.dj_ie6 .nihilo .dijitSliderDisabled .dijitRuleContainer, +.dj_ie6 .nihilo .dijitSliderDisabled .dijitSliderRemainingBar, +.dj_ie6 .nihilo .dijitSliderDisabled .dijitSliderProgressBar { + filter: gray() alpha(opacity=40); } \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/form/Slider_rtl.css b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/form/Slider_rtl.css index 069d4fec..8410f361 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/form/Slider_rtl.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/form/Slider_rtl.css @@ -1,34 +1,36 @@ - -/* Slider */ - -.dijitRtl .dijitSliderProgressBarH, -.dijitRtl .dijitSliderRemainingBarH, -.dijitRtl .dijitSliderLeftBumper, -.dijitRtl .dijitSliderRightBumper, -.dijitRtl .dijitSliderTopBumper { - background-position: top right; -} - -.dijitRtl .dijitSliderProgressBarV, -.dijitRtl .dijitSliderRemainingBarV, -.dijitRtl .dijitSliderBottomBumper { - background-position: bottom right; -} - -.dijitRtl .dijitSliderLeftBumper { - border-left-width: 0px; - border-right-width: 1px; -} - -.dijitRtl .dijitSliderRightBumper { - border-left-width: 1px; - border-right-width: 0px; -} - -.dijitRtl .dijitSliderIncrementIconH { - background-image:url('../images/arrowLeft.png'); -} - -.dijitRtl .dijitSliderDecrementIconH { - background-image:url('../images/arrowRight.png'); -} + +/* Slider */ + +.dijitRtl .nihilo .dijitSliderProgressBarH, +.dijitRtl .nihilo .dijitSliderRemainingBarH, +.dijitRtl .nihilo .dijitSliderLeftBumper, +.dijitRtl .nihilo .dijitSliderRightBumper, +.dijitRtl .nihilo .dijitSliderTopBumper { + background-position: top right; +} + +.dijitRtl .nihilo .dijitSliderProgressBarV, +.dijitRtl .nihilo .dijitSliderRemainingBarV, +.dijitRtl .nihilo .dijitSliderBottomBumper { + background-position: bottom right; +} + +.dijitRtl .nihilo .dijitSliderLeftBumper { + border-left-width: 0px; + border-right-width: 1px; +} + +.dijitRtl .nihilo .dijitSliderRightBumper { + border-left-width: 1px; + border-right-width: 0px; +} + +.dijitRtl .nihilo .dijitSliderIncrementIconH { + background:url('../images/spriteRoundedIconsSmall.png') no-repeat left top; + #background:url('../images/spriteRoundedIconsSmall.gif') no-repeat left top; +} + +.dijitRtl .nihilo .dijitSliderDecrementIconH { + background:url('../images/spriteRoundedIconsSmall.png') no-repeat -30px top; + #background:url('../images/spriteRoundedIconsSmall.gif') no-repeat -30px top; +} diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/images/editor.gif b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/images/editor.gif index 1c96329c..127c9c43 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/images/editor.gif and b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/images/editor.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/images/editorDisabled.gif b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/images/editorDisabled.gif new file mode 100644 index 00000000..9dc51036 Binary files /dev/null and b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/images/editorDisabled.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/images/editorDisabled_rtl.gif b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/images/editorDisabled_rtl.gif new file mode 100644 index 00000000..74d407af Binary files /dev/null and b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/images/editorDisabled_rtl.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/images/editor_rtl.gif b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/images/editor_rtl.gif index ef049380..b94d040b 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/images/editor_rtl.gif and b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/images/editor_rtl.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/images/sliderThumb.gif b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/images/sliderThumb.gif new file mode 100644 index 00000000..29899a4b Binary files /dev/null and b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/images/sliderThumb.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/layout/AccordionContainer.css b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/layout/AccordionContainer.css index de911e96..0db74776 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/layout/AccordionContainer.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/layout/AccordionContainer.css @@ -1,7 +1,30 @@ /** * dijit.layout.Accordioncontainer * - */ + */ + +.nihilo .dijitAccordionContainer { + border-color: #ccc; +} + +/* nested classes */ + +.nihilo .dijitTabContainer-dijitAccordionContainer { + border: none; +} + +.nihilo .dijitAccordionContainer-dijitAccordionContainer { + border: none; + background-color: #fff; +} + +.nihilo .dijitSplitContainer-dijitAccordionContainer, +.nihilo .dijitBorderContainer-dijitAccordionContainer { + border: 1px #ccc solid; + background-color: #fff; +} + +/* common */ .nihilo .dijitAccordionPane { background-color: #e7e7e7; @@ -28,7 +51,7 @@ } .nihilo .dijitAccordionArrow { - background:url("../images/spriteRoundedIconsSmall.gif") no-repeat; + background:url("../images/spriteRoundedIconsSmall.gif") no-repeat -30px top; width:15px; height:15px; margin-top:-1px; @@ -39,6 +62,11 @@ margin-top:-1px; } +.nihilo .dijitAccordionText { + margin-left: 4px; + margin-right: 4px; +} + .nihilo .dijitAccordionBody { background: #fff; } \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/layout/AccordionContainer_rtl.css b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/layout/AccordionContainer_rtl.css index 4ceda54c..1fc2a5fd 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/layout/AccordionContainer_rtl.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/layout/AccordionContainer_rtl.css @@ -1,3 +1,8 @@ -.dijitRtl .dijitAccordionArrow { - background-position: -30px top; +.dijitRtl .nihilo .dijitAccordionArrow { + background-position: 0px top; +} + +.dijitRtl .nihilo .dijitAccordionTitle-selected .dijitAccordionArrow { + /* same rule as LTR mode, just listed to override previous rule in this file */ + background-position: -15px top; } diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/layout/BorderContainer.css b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/layout/BorderContainer.css index 9383e699..120eb307 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/layout/BorderContainer.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/layout/BorderContainer.css @@ -1,34 +1,57 @@ -/** - * dijit.layout.BorderContainer - * - */ - -.nihilo .dijitSplitterH { - background:url("../images/splitContainerSizerH.png") repeat-x #fff; - border:0; - border-left:0px solid #d3d3d3; - border-right:0px solid #d3d3d3; - height:5px; -} - -.nihilo .dijitSplitterH .dijitSplitterThumb { - background:url("../images/splitContainerSizerH-thumb.png") no-repeat; - top:1px; - width:19px; - height:2px; -} - -.nihilo .dijitSplitterV { - background:url("../images/splitContainerSizerV.png") repeat-y #fff; - border:0; - border-top:0px solid #d3d3d3; - border-bottom:0px solid #d3d3d3; - width:5px; -} - -.nihilo .dijitSplitterV .dijitSplitterThumb { - background:url("../images/splitContainerSizerV-thumb.png") no-repeat; - left:1px; - height:19px; - width:5px; +/** + * dijit.layout.BorderContainer + * + */ + +.nihilo .dijitBorderContainer { + background-color: #fcfcfc; + padding: 5px; +} + +.nihilo .dijitBorderContainer-dijitBorderContainer { + border: none; + padding: 0px; +} + +.nihilo .dijitSplitterH, +.nihilo .dijitGutterH { + background:#FCFCFC; + border:0; + border-left:0px solid #d3d3d3; + border-right:0px solid #d3d3d3; + height:5px; +} + +.nihilo .dijitSplitterH .dijitSplitterThumb { + background:url("../images/splitContainerSizerH-thumb.png") no-repeat; + top:1px; + width:19px; + height:2px; +} + +.nihilo .dijitSplitterV, +.nihilo .dijitGutterV { + background:#FCFCFC; + border:0; + border-top:0px solid #d3d3d3; + border-bottom:0px solid #d3d3d3; + width:5px; +} + +.nihilo .dijitSplitterV .dijitSplitterThumb { + background:url("../images/splitContainerSizerV-thumb.png") no-repeat; + left:1px; + height:19px; + width:5px; +} + +/* active splitter */ +.nihilo .dijitSplitterActive { + font-size: 1px; + background-image: none; + background-color: #aaa; + -moz-opacity: 0.6; + opacity: 0.6; + filter: Alpha(Opacity=60); + margin: 0; } \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/layout/ContentPane.css b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/layout/ContentPane.css new file mode 100644 index 00000000..1abd1733 --- /dev/null +++ b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/layout/ContentPane.css @@ -0,0 +1,23 @@ +/* ContentPane */ + +.nihilo .dijitContentPane { + padding: 0px; +} + +/* nested layouts */ +.nihilo .dijitTabContainerTop-dijitContentPane, +.nihilo .dijitTabContainerLeft-dijitContentPane, +.nihilo .dijitTabContainerRight-dijitContentPane, +.nihilo .dijitTabContainerBottom-dijitContentPane, +.nihilo .dijitAccordionContainer-dijitContentPane { + border: none; + background-color: #fff; + padding: 5px; +} + +.nihilo .dijitSplitContainer-dijitContentPane, +.nihilo .dijitBorderContainer-dijitContentPane { + border: 1px #ccc solid; + background-color: #fff; + padding: 5px; +} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/layout/TabContainer.css b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/layout/TabContainer.css index 8b404e0d..2035ad94 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/layout/TabContainer.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/layout/TabContainer.css @@ -8,41 +8,42 @@ /* Classes for all types of tabs (top/bottom/left/right) */ -.nihilo .dijitTabPaneWrapper { /* Container for tab content */ - /* - overflow: hidden; - */ +/* Tabs, shared classes */ +.nihilo .dijitTabPaneWrapper { background:#fff; border:1px solid #ccc; + margin: 0; + padding: 0; } -.nihilo .dijitTab { + +.nihilo .dijitTabInnerDiv { + padding:0px 3px 0px 0px; + margin: 0 0 0 4px; + background: url("../images/tabContainerSprite.gif") no-repeat; + background-position: right -400px; +} + +.nihilo .dijitTab { line-height:normal; - margin-right:3px; /* space between one tab and the next in top/bottom mode */ + margin:0 2px 0 0; /* space between one tab and the next in top/bottom mode */ padding:0px; background: url("../images/tabContainerSprite.gif") no-repeat 0 -300px; - font-size: 0.9em; - font-weight: bold; color: #6d6d6d; - margin-bottom: -1px; -} - -.nihilo dijitTabChecked { - margin-bottom: -2px; + border-bottom: 1px #ccc solid; } .nihilo .dijitTabInnerDiv .dijitTabContent { - padding:8px 10px 4px 10px; + padding:5px 3px 4px 4px; background: url("../images/tabContainerSprite.gif") repeat-x 0 -350px; + position: relative; } -.nihilo .dijitTabInnerDiv { - padding:0px 10px 0px 10px; - background: url("../images/tabContainerSprite.gif") no-repeat; - background-position: right -400px; - border: none; +.dijitTabSpacer { + font-size: 1px; } +/* hovered tab */ .nihilo .dijitTabHover, .nihilo .dijitTabCloseButtonHover { color: #243C5F; @@ -52,15 +53,14 @@ .nihilo .dijitTabHover .dijitTabInnerDiv, .nihilo .dijitTabCloseButtonHover .dijitTabInnerDiv { background: url("../images/tabContainerSprite.gif") no-repeat right -250px; - border: none; } .nihilo .dijitTabHover .dijitTabInnerDiv .dijitTabContent, .nihilo .dijitTabCloseButtonHover .dijitTabInnerDiv .dijitTabContent { background: url("../images/tabContainerSprite.gif") repeat-x 0 -200px; - padding:8px 10px 4px 10px; } +/* checked tab*/ .nihilo .dijitTabChecked, .nihilo .dijitTabCloseButtonChecked { @@ -69,301 +69,307 @@ } .nihilo .dijitTabChecked .dijitTabInnerDiv { - padding:0px 10px 0px 10px; background: url("../images/tabContainerSprite.gif") no-repeat right -100px; - border: none; } .nihilo .dijitTabChecked .dijitTabInnerDiv .dijitTabContent { background: url("../images/tabContainerSprite.gif") repeat-x 0 -50px; - padding:8px 10px 5px 10px; color: #243C5F !important; } -/* top specific classes */ - -.nihilo .dijitTabLabels-top { - border-left: 1px solid #ccc; - border-top: 1px solid #ccc; - border-right: 1px solid #ccc; - padding-top: 2px; - padding-left: 3px; - background: #fafafa url("../images/tabStripe.gif") repeat-x left bottom; - padding-bottom: 4px; -} -/* -.nihilo .dijitAlignTop .dijitTabStripe { - background: url("../images/tabStripe.gif") repeat-x left bottom; - padding-left: 2px; - padding-top: 0px; - height: 4px; - clear: both; - font-size: 1px; - margin-left: -3px; -} -*/ - -.nihilo .dijitAlignLeft .dijitTab, -.nihilo .dijitAlignRight .dijitTab { - margin-right:0px; - margin-bottom:5px; /* space between one tab and the next in left/right mode */ -} - -/* make the active tab white on the side next to the content pane */ -.nihilo .dijitAlignTop .dijitTabChecked, -.nihilo .dijitAlignTop .dijitTabCloseButtonChecked -{ - border-bottom-color:white; - vertical-align:bottom; -} - -.nihilo .dijitAlignBottom .dijitTabChecked, -.nihilo .dijitAlignBottom .dijitTabCloseButtonChecked -{ - border-top-color:white; - /*-moz-border-radius:2px 2px 0px 0px; eliminate some border detritrus on moz */ -} - -.nihilo .dijitAlignLeft .dijitTabChecked, -.nihilo .dijitAlignLeft .dijitTabCloseButtonChecked -{ - border-right-color:white; -} - -.nihilo .dijitAlignRight .dijitTabChecked, -.nihilo .dijitAlignRight .dijitTabCloseButtonChecked -{ - border-left-color:white; -} - -/* bottom specific classes */ - -.nihilo .dijitTabLabels-bottom { - padding-bottom: 2px; - padding-left: 3px; - border-left: 1px solid #ccc; - border-bottom: 1px solid #ccc; - border-right: 1px solid #ccc; - background: #fafafa url("../images/tabStripeBottom.gif") repeat-x left top; - padding-top: 3px; -} -/* -.nihilo .dijitAlignBottom .dijitTabStripe { - background: url("../images/tabStripe.gif") repeat-x left bottom; - padding-left: 2px; - padding-top: 0px; - height: 4px; - clear: both; - font-size: 1px; - margin-left: -3px; -} -*/ -.nihilo .dijitAlignBottom .dijitTab { - line-height:normal; - margin-right:3px; /* space between one tab and the next in top/bottom mode */ - padding:0px; - background: url("../images/tabBottomEnabledSpriteLR.gif") no-repeat bottom left; - font-size: 0.9em; - font-weight: bold; - color: #6d6d6d; - margin-bottom: 0px; - margin-top: 1px; -} - -.nihilo .dijitAlignBottom .dijitTabChecked { - margin-bottom: 0px; - margin-top: 0px !important; -} - -.nihilo .dijitAlignBottom .dijitTabInnerDiv .dijitTabContent { - padding:6px 10px 6px 10px; - background: url("../images/tabBottomEnabledC.gif") repeat-x bottom left; -} - -.nihilo .dijitAlignBottom .dijitTabInnerDiv { - padding:0px 10px 0px 10px; - background: url("../images/tabBottomEnabledSpriteLR.gif") no-repeat bottom right; - border: none; -} - -.nihilo .dijitAlignBottom .dijitTabHover, -.nihilo .dijitAlignBottom .dijitTabCloseButtonHover { - color: #243C5F; - background: url("../images/tabBottomHoverSpriteLR.gif") no-repeat bottom left; -} - -.nihilo .dijitAlignBottom .dijitTabHover .dijitTabInnerDiv, -.nihilo .dijitAlignBottom .dijitTabCloseButtonHover .dijitTabInnerDiv { - background: url("../images/tabBottomHoverSpriteLR.gif") no-repeat bottom right; - border: none; -} - -.nihilo .dijitAlignBottom .dijitTabHover .dijitTabInnerDiv .dijitTabContent, -.nihilo .dijitAlignBottom .dijitTabCloseButtonHover .dijitTabInnerDiv .dijitTabContent { - background: url("../images/tabBottomHoverC.gif") repeat-x bottom left; - padding:6px 10px 6px 10px; -} - -.dj_ie6 .nihilo .dijitAlignBottom .dijitTabHover, -.dj_ie6 .nihilo .dijitAlignBottom .dijitTabCloseButtonHover { - background-image: url("../images/tabHover.gif"); -} - -.nihilo .dijitAlignBottom .dijitTabChecked, -.nihilo .dijitAlignBottom .dijitTabCloseButtonChecked -{ - /* the selected tab (with or without hover) */ - background: url("../images/tabBottomActiveSpriteLR.gif") no-repeat bottom left; -} - -.nihilo .dijitAlignBottom .dijitTabChecked .dijitTabInnerDiv { - padding:0px 10px 0px 10px; - background: url("../images/tabBottomActiveSpriteLR.gif") no-repeat bottom right; - border: none; -} - -.nihilo .dijitAlignBottom .dijitTabChecked .dijitTabInnerDiv .dijitTabContent { - background: url("../images/tabBottomActiveC.gif") repeat-x bottom left; - padding:7px 10px 6px 10px; -} - - -/* left specific classes */ -.nihilo .dijitAlignLeft .dijitTab { - margin-right: 1px !important; -} - -.nihilo .dijitAlignLeft .dijitTabChecked { - margin-right: 0px !important; -} - -.nihilo .dijitAlignLeft .dijitTabChecked .dijitTabInnerDiv { - background: url("../images/tabLeftChecked.gif") no-repeat right top !important; - padding-left: 10px; - border-bottom: 1px solid #dedede !important; -} - -.nihilo .dijitAlignLeft .dijitTabInnerDiv { - background: url("../images/tabContainerSprite.gif") no-repeat right -350px; - padding-left: 10px; - border-bottom: 1px solid #dedede; -} -.nihilo .dijitAlignLeft .dijitTabHover .dijitTabInnerDiv { - background: url("../images/tabContainerSprite.gif") no-repeat right -200px; - padding-left: 10px; - border-bottom: 1px solid #dedede; -} - -.nihilo .dijitTabLabels-left-h { - padding-left: 2px; - padding-top: 3px; - border-left: 1px solid #b1badf; - border-bottom: 1px solid #b1badf; - border-top: 1px solid #b1badf; - background: #fafafa url("../images/tabStripeLeft.gif") repeat-y right top; - padding-right: 3px; -} - -.nihilo .dijitAlignLeft .dijitTabInnerDiv .dijitTabContent { - padding:7px 10px 6px 10px !important; -} - -/* right specific classes */ -.nihilo .dijitTabLabels-right-h { - padding-right: 2px; - padding-top: 3px; - border-right: 1px solid #b1badf; - border-bottom: 1px solid #b1badf; - border-top: 1px solid #b1badf; - background: #fafafa url("../images/tabStripeRight.gif") repeat-y left top; - padding-left: 3px; -} - -.nihilo .dijitAlignRight .dijitTab { - margin-left: 1px; -} - -.nihilo .dijitAlignRight .dijitTabChecked { - margin-left: 0px; -} - -.nihilo .dijitAlignRight .dijitTabChecked { - background: url("../images/tabRightChecked.gif") no-repeat left top !important; -} - -.nihilo .dijitAlignRight .dijitTab { - background: url("../images/tabContainerSprite.gif") no-repeat left -350px; -} -.nihilo .dijitAlignRight .dijitTabHover .dijitTab { - background: url("../images/tabContainerSprite.gif") no-repeat left -200px; -} -.nihilo .dijitAlignRight .dijitTabInnerDiv .dijitTabContent { - padding:7px 10px 6px 10px !important; -} - -.nihilo .dijitAlignRight .dijitTabChecked .dijitTabInnerDiv { - border-bottom: 1px solid #dedede !important; -} - -.nihilo .dijitAlignRight .dijitTabInnerDiv { - border-bottom: 1px solid #dedede; -} -.nihilo .dijitAlignRight .dijitTabHover .dijitTabInnerDiv { - border-bottom: 1px solid #dedede; -} - -/* make space for a positioned close button */ -.nihilo .dijitTab .dijitClosable { - position: relative; - padding: 0; - padding-left: 10px !important; - padding-right: 20px !important; -} - -.nihilo .dijitTab img { - padding: 0; - margin: 0; -} - -.nihilo .dijitTab .dijitClosable .closeImage { - position:absolute; - top: 5px; - right: 5px; - height: 15px; - width: 15px; +.nihilo .dijitTab .dijitClosable .closeNode { + /* Inline-block */ + display:-moz-inline-box; /* FF2 */ + display:inline-block; /* webkit and FF3 */ + #zoom: 1; /* set hasLayout:true to mimic inline-block */ + #display:inline; /* don't use .dj_ie since that increases the priority */ + vertical-align:top; + width: 1.25em; + height: 1.25em; padding: 0; margin: 0; - background: url("../images/spriteRoundedIconsSmall.png") no-repeat -60px top; + } +.nihilo .dijitTab .dijitClosable .closeImage { + background: url("../images/spriteRoundedIconsSmall.png") no-repeat -60px top; + width: 15px; + height: 15px; +} + .dj_ie6 .dijitTab .dijitClosable .closeImage { - background:url("../images/spriteRoundedIconsSmall.gif") no-repeat -60px top; + background: url("../images/spriteRoundedIconsSmall.gif") no-repeat -60px top; +} + +.nihilo .dijitTabCloseButton .dijitClosable .closeImage { + background: url("../images/spriteRoundedIconsSmall.png") no-repeat -60px top; } .dj_ie6 .nihilo .dijitTabCloseButton .dijitClosable .closeImage { background: url("../images/spriteRoundedIconsSmall.gif") no-repeat -60px top; } -.nihilo .dijitTabHover .dijitClosable .closeImage { - background: url("../images/spriteRoundedIconsSmall.png") no-repeat -60px -15px !important; +.nihilo .dijitTabCloseButtonHover .dijitClosable .closeImage { + background: url("../images/spriteRoundedIconsSmall.png") no-repeat -60px top; } -.dj_ie6 .nihilo .dijitTabHover .dijitClosable .closeImage { - background: url("../images/spriteRoundedIconsSmall.gif") no-repeat -60px -15px !important; +.dj_ie6 .nihilo .dijitTabCloseButtonHover .dijitClosable .closeImage { + background: url("../images/spriteRoundedIconsSmall.gif") no-repeat -60px top; } -/* correct for IE6. - We cant force hasLayout as that blows out the shrink wrapped tabs - ..so we shim in the closeImage position properties instead -*/ -.dj_ie6 .nihilo .dijitAlignLeft .dijitTab .dijitClosable .closeImage { - left:-20px; +.nihilo .dijitTab .dijitTabButtonSpacer { + height: 15px; + width: 1px; } -.nihilo .dijitAlignBottom .dijitTab .dijitClosable .closeImage { - top: auto; - bottom: 7px; - right: 3px; +/* ================================ */ +/* top tabs */ +.nihilo .dijitTabContainerTop-tabs { + margin-bottom: -1px; + border-color: #ccc; + padding-left: 3px; } -.nihilo .dijitAlignLeft .dijitTab .dijitClosable .closeImage { - top: 7px; - left: 3px; +/* top container */ +.nihilo .dijitTabContainerTop-container { + border-top: none; +} + +/* checked tabs */ +.nihilo .dijitTabContainerTop-tabs .dijitTabChecked { + border-bottom-color: #f8f8f8; +} + +/* strip */ +.nihilo .dijitTabContainerTopStrip { + border: 1px solid #ccc; + padding-top: 2px; + padding-left: 3px; +} + +.nihilo .dijitTabContainerTopStrip { + background: #f2f2f2; +} + +/* ================================ */ +/* bottom tabs */ +.nihilo .dijitTabContainerBottom-tabs { + margin-top: -1px; + border-color: #ccc; + padding-left: 3px; +} + +/* bottom container */ +.nihilo .dijitTabContainerBottom-container { + border-bottom: none; +} + +.nihilo .dijitTabContainerBottom-tabs .dijitTab { + border-bottom: none; + border-top: 1px solid #ccc; + background: url("../images/tabBottomEnabledSpriteLR.gif") no-repeat bottom left; +} + +/* checked tabs */ +.nihilo .dijitTabContainerBottom-tabs .dijitTabChecked { + border-top-color:#f8f8f8; +} + + +.nihilo .dijitTabContainerBottom-tabs .dijitTabInnerDiv .dijitTabContent { + padding-top: 4px; + padding-bottom: 5px; + background: url("../images/tabBottomEnabledC.gif") repeat-x bottom left; +} + +.nihilo .dijitTabContainerBottom-tabs .dijitTabInnerDiv { + background: url("../images/tabBottomEnabledSpriteLR.gif") no-repeat bottom right; +} + +.nihilo .dijitTabContainerBottom-tabs .dijitTabHover, +.nihilo .dijitTabContainerBottom-tabs .dijitTabCloseButtonHover { + color: #243C5F; + background: url("../images/tabBottomHoverSpriteLR.gif") no-repeat bottom left; +} + +.nihilo .dijitTabContainerBottom-tabs .dijitTabHover .dijitTabInnerDiv, +.nihilo .dijitTabContainerBottom-tabs .dijitTabCloseButtonHover .dijitTabInnerDiv { + background: url("../images/tabBottomHoverSpriteLR.gif") no-repeat bottom right; +} + +.nihilo .dijitTabContainerBottom-tabs .dijitTabHover .dijitTabInnerDiv .dijitTabContent, +.nihilo .dijitTabContainerBottom-tabs .dijitTabCloseButtonHover .dijitTabInnerDiv .dijitTabContent { + background: url("../images/tabBottomHoverC.gif") repeat-x bottom left; +} + +.nihilo .dijitTabContainerBottom-tabs .dijitTabChecked, +.nihilo .dijitTabContainerBottom-tabs .dijitTabCloseButtonChecked +{ + /* the selected tab (with or without hover) */ + background: url("../images/tabBottomActiveSpriteLR.gif") no-repeat bottom left; +} + +.nihilo .dijitTabContainerBottom-tabs .dijitTabChecked .dijitTabInnerDiv { + background: url("../images/tabBottomActiveSpriteLR.gif") no-repeat bottom right; +} + +.nihilo .dijitTabContainerBottom-tabs .dijitTabChecked .dijitTabInnerDiv .dijitTabContent { + background: url("../images/tabBottomActiveC.gif") repeat-x bottom left; +} + +/* strip */ +.nihilo .dijitTabContainerBottomStrip { + padding-bottom: 2px; + padding-left: 3px; + border: 1px solid #ccc; +} + +.nihilo .dijitTabContainerBottomStrip { + background: #f2f2f2; +} + +/* top/bottom strip */ +.nihilo .dijitTabContainerBottom-spacer, +.nihilo .dijitTabContainerTop-spacer { + height: 2px; + border: 1px solid #ccc; + background: #f8f8f8; +} + + +/* ================================ */ +/* right tabs */ +.nihilo .dijitTabContainerRight-tabs { + margin-left: -1px; + border-color: #ccc; + padding-top: 3px; +} + +/* right container */ +.nihilo .dijitTabContainerRight-container { + border-right: none; +} + +.nihilo .dijitTabContainerRight-tabs .dijitTab { + border-bottom: none; + border-left: 1px solid #ccc; + border-bottom: 1px solid #dedede !important; +} + + +/* some odd ie bug when borders dissapear when setting a bottom margin, this sortof helps */ +.dj_ie .nihilo .dijitTabContainerRight-tabs .dijitTabInnerDiv { + border-bottom: solid #fff 1px; +} + +/* checked tabs */ +.nihilo .dijitTabContainerRight-tabs .dijitTabChecked { + border-left-color: #f8f8f8; +} + +.nihilo .dijitTabContainerRight-tabs .dijitTabChecked { + background: url("../images/tabRightChecked.gif") no-repeat left top !important; +} + +/* some odd ie bug when borders dissapear when setting a bottom margin, this sortof helps */ +.dj_ie .nihilo .dijitTabContainerRight-tabs .dijitTabChecked .dijitTabInnerDiv, +.dj_ie .nihilo .dijitTabContainerRight-tabs .dijitTabCheckedHover .dijitTabInnerDiv { + border-bottom: solid #efefef 1px; +} + +.nihilo .dijitTabContainerRight-tabs .dijitTab { + background: url("../images/tabContainerSprite.gif") no-repeat left -350px; +} +.nihilo .dijitTabContainerRight-tabs .dijitTabHover .dijitTab { + background: url("../images/tabContainerSprite.gif") no-repeat left -200px; +} + +/* strip */ +.nihilo .dijitTabContainerRightStrip { + padding-right: 2px; + padding-top: 3px; + border: 1px solid #ccc; +} + +.nihilo .dijitTabContainerRightStrip { + background: #f2f2f2; +} + +/* ================================ */ +/* left tabs */ +.nihilo .dijitTabContainerLeft-tabs { + margin-right: -1px; + border-color: #ccc; + padding-top: 3px; +} + +/* left conatiner */ +.nihilo .dijitTabContainerLeft-container { + border-left: none; +} + +.nihilo .dijitTabContainerLeft-tabs .dijitTab { + border-right: 1px solid #ccc; + border-bottom: 1px solid #dedede; +} + +/* checked tabs */ +.nihilo .dijitTabContainerLeft-tabs .dijitTabChecked { + border-right: 1px solid #f8f8f8; +} + +.nihilo .dijitTabContainerLeft-tabs .dijitTabInnerDiv { + background: url("../images/tabContainerSprite.gif") no-repeat right -350px; +} +.nihilo .dijitTabContainerLeft-tabs .dijitTabHover .dijitTabInnerDiv { + background: url("../images/tabContainerSprite.gif") no-repeat right -200px; +} +.nihilo .dijitTabContainerLeft-tabs .dijitTabChecked .dijitTabInnerDiv, +.nihilo .dijitTabContainerLeft-tabs .dijitTabCheckedHover .dijitTabInnerDiv { + background: url("../images/tabLeftChecked.gif") no-repeat right top; +} + +.dj_ie .nihilo .dijitTabContainerLeft-tabs .dijitTabChecked .dijitTabInnerDiv, +.dj_ie .nihilo .dijitTabContainerLeft-tabs .dijitTabCheckedHover .dijitTabInnerDiv { + border-bottom: solid #efefef 1px; +} + +.dj_ie .nihilo .dijitTabContainerLeft-tabs .dijitTabInnerDiv { +border-bottom: solid #fff 1px; +} + +/* strip */ +.nihilo .dijitTabContainerLeftStrip { + padding-left: 2px; + padding-top: 3px; + border: 1px solid #ccc; +} + +.nihilo .dijitTabContainerLeftStrip { + background: #f2f2f2; +} + +/* ================================ */ +/* left/right tabs */ +.nihilo .dijitTabContainerLeft-tabs .dijitTab, +.nihilo .dijitTabContainerRight-tabs .dijitTab { + margin-right:auto; + margin-bottom:2px; /* space between one tab and the next in left/right mode */ +} + +/* left/right tabstrip */ +.nihilo .dijitTabContainerLeft-spacer, +.nihilo .dijitTabContainerRight-spacer { + width: 2px; + border: 1px solid #ccc; + background: #f8f8f8; +} + + +/* ================================ */ + +/* this resets the tabcontainer stripe when within a contentpane */ +.nihilo .dijitTabContainerTop-dijitContentPane .dijitTabContainerTop-tabs { + border-left: 0px solid #ccc; + border-top: 0px solid #ccc; + border-right: 0px solid #ccc; + padding-top: 0px; + padding-left: 0px; } diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/layout/TabContainer_rtl.css b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/layout/TabContainer_rtl.css index bf6587e5..efa86330 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/layout/TabContainer_rtl.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/layout/TabContainer_rtl.css @@ -1,69 +1,47 @@ -/* TabContainer */ - -.dijitRtl .dijitTab { +.dijitRtl .nihilo .dijitTab { margin-right:0; - margin-left:3px; /* space between one tab and the next in top/bottom mode */ + margin-left:2px; /* space between one tab and the next in top/bottom mode */ } -.dijitRtl .dijitTab .dijitTabInnerDiv { - border-left:none; +/* tab strips */ +.dijitRtl .nihilo .dijitTabContainerTopStrip, +.dijitRtl .nihilo .dijitTabContainerBottomStrip { + padding-right: 3px; + padding-left: 0px; } -.dijitRtl .dijitTab .dijitClosable { - padding: 0 10px 0 20px; +.dijitRtl .nihilo .dijitTabContainerTop-tabs { + padding-left: auto; + padding-right: 3px; } -.dijitRtl .dijitTab .closeImage { - position:static; +.dijitRtl .nihilo .dijitTabContainerBottom-tabs { + padding-left: auto; + padding-right: 3px; } -.dj_gecko .dijitTab .closeImage { - position:relative; - float:none; - padding:0; +.dijitRtl .nihilo .dijitTabInnerDiv { + padding-left: 3px; + padding-right: 4px; } -.dijitRtl .dijitTab .dijitClosable .closeImage { - right:auto; - left:3px; - background-position: -60px top; +.dijitRtl .nihilo .dijitTabPaneWrapper { + #zoom: 1; } -.dj_ie .dijitRtl .dijitTab .dijitClosable .closeImage { - width:12px !important; +.dj_ie-rtl .nihilo .dijitTabContainerLeft-tabs { + margin-left: 0px !important; } -.dijitRtl .dijitAlignLeft .dijitTab, -.dijitRtl .dijitAlignRight .dijitTab { +.dj_ie-rtl .nihilo .dijitTabContainerRight-tabs { + margin-right: 0px !important; +} + +.dijitRtl .nihilo .dijitTabContainerLeft-tabs .dijitTab, +.dijitRtl .nihilo .dijitTabContainerRight-tabs .dijitTab { margin-left:0px; } -.dijitRtl .dijitAlignBottom .dijitTab { - margin-right:0; - margin-left:3px; /* space between one tab and the next in top/bottom mode */ -} - -.dijitRtl .dijitAlignBottom .dijitTab .dijitClosable .closeImage { - right:auto; - left:3px; -} - -.dijitRtl .dijitAlignRight .dijitTab .dijitTabInnerDiv { - padding-left:10px; - padding-right:20px; -} - -.dijitRtl .dijitAlignLeft .dijitTab .dijitTabInnerDiv { - padding-left:20px; - padding-right:10px; -} - -.dijitRtl .dijitAlignRight .dijitTab .dijitClosable .closeImage { - left:auto; - right:3px; -} - -.dijitRtl .dijitAlignLeft .dijitTab .dijitClosable .closeImage { - right:auto; - left:3px; +.dj_ie .nihilo .dijitTab .dijitTabInnerDiv{ + width : 1%; } \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/nihilo.css b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/nihilo.css index 91652bea..47ed3516 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/nihilo.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/nihilo/nihilo.css @@ -17,6 +17,7 @@ @import url("../dijit.css"); @import url("Common.css"); +@import url("layout/ContentPane.css"); @import url("layout/TabContainer.css"); @import url("layout/AccordionContainer.css"); @import url("layout/SplitContainer.css"); @@ -26,12 +27,12 @@ @import url("form/ComboBox.css"); @import url("form/Checkbox.css"); @import url("form/RadioButton.css"); -@import url("form/Textarea.css"); @import url("form/Slider.css"); @import url("Tree.css"); @import url("ProgressBar.css"); @import url("TitlePane.css"); @import url("Calendar.css"); +@import url("TimePicker.css"); @import url("Toolbar.css"); @import url("Dialog.css"); @import url("Menu.css"); diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/Calendar.css b/spring-js/src/main/resources/META-INF/dijit/themes/soria/Calendar.css index 937a5486..cc17363b 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/soria/Calendar.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/soria/Calendar.css @@ -4,10 +4,12 @@ /* next/prev month buttons */ width:15px; height:15px; - font-size: 1px; + background-image: url("images/spriteRoundedIconsSmall.png"); + background-repeat: no-repeat; } .dj_ie6 .soria .dijitCalendarIncrementControl { - padding:.1em; + font-size:.1em; + background-image: url("images/spriteRoundedIconsSmall.gif"); } .soria .dijitCalendarIncreaseInner, @@ -16,17 +18,10 @@ } .soria .dijitCalendarDecrease { - background:url("images/spriteRoundedIconsSmall.png") no-repeat top left; + background-position: top left; } -.dj_ie6 .soria .dijitCalendarDecrease { - background:url("images/spriteRoundedIconsSmall.gif") no-repeat top left; -} - .soria .dijitCalendarIncrease { - background:url(images/spriteRoundedIconsSmall.png) no-repeat -30px top; -} -.dj_ie6 .soria .dijitCalendarIncrease { - background:url("images/spriteRoundedIconsSmall.gif") no-repeat -30px top; + background-position: -30px top; } .soria table.dijitCalendarContainer { @@ -45,8 +40,8 @@ text-align:center; } .dj_ie6 .soria .dijitCalendarMonthContainer th { - padding-top:.1em; - padding-bottom:0em; + padding-top:.2em; + padding-bottom:.1em; } .soria .dijitCalendarDayLabelTemplate { @@ -69,22 +64,20 @@ font-weight: bold; } -.dj_ie7 .soria .dijitCalendarDateTemplate, -.dj_ie6 .soria .dijitCalendarDateTemplate { - font-size: 0.8em; -} - .soria .dijitCalendarDateTemplate { /* style for each day cell */ font-size: 0.9em; font-weight: bold; text-align: center; - padding: 0.3em 0.3em 0.1em 0.3em; + padding: 0.3em 0.3em 0.05em 0.3em; letter-spacing: 1px; background-color: #fff; border:#fff solid 1px !important; } +.dj_ie .soria .dijitCalendarDateTemplate { + padding: 0.1em .33em 0.02em .33em; +} .soria .dijitCalendarPreviousMonth, .soria .dijitCalendarNextMonth { diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/Calendar_rtl.css b/spring-js/src/main/resources/META-INF/dijit/themes/soria/Calendar_rtl.css index c72d43b5..70efe520 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/soria/Calendar_rtl.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/soria/Calendar_rtl.css @@ -1,16 +1,9 @@ - /* Calendar */ -.dijitRtl .dijitCalendarDecrease { +.dijitRtl .soria .dijitCalendarDecrease { background-position: -30px top; } -.dijitRtl .dijitCalendarIncrease { +.dijitRtl .soria .dijitCalendarIncrease { background-position: 0px top; } -.dj_ie6 .dijitRtl .dijitCalendarIncrease { - background-position: 0px top; -} -.dj_ie6 .dijitRtl .dijitCalendarDecrease { - background-position: -30px top; -} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/Dialog.css b/spring-js/src/main/resources/META-INF/dijit/themes/soria/Dialog.css index ed48613c..475bd977 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/soria/Dialog.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/soria/Dialog.css @@ -1,4 +1,3 @@ - /* Dialog */ .soria .dijitDialog { @@ -19,7 +18,7 @@ .soria .dijitDialog .dijitDialogPaneContent { background: #ffffff; border:none; - border-top: 1px solid #b1badf; /* #cddde9; /* w/out this, an

on the top line causes a gap between the .content and .label */ + border-top: 1px solid #b1badf; /* w/out this, an

on the top line causes a gap between the .content and .label */ padding:10px; } @@ -27,8 +26,7 @@ .soria .dijitDialogTitleBar { /* outer container for the titlebar of the dialog */ background: #fafafa url("images/titleBar.png") repeat-x top left; - /* border: 1px solid #bfbfbf; */ - padding: 5px 6px 3px 2px; + padding: 5px 6px 3px 6px; cursor: move; outline:0; /* remove this line if keyboard focus on dialog startup is an issue. tab still takes you to first focusable element */ } @@ -36,14 +34,13 @@ .soria .dijitDialogTitle { /* typography and styling of the dialog title */ font-weight: bold; - padding: 8px 12px 8px 12px; + padding: 4px; outline:0; } .soria .dijitDialogCloseIcon { /* the default close icon for the dialog */ background : url("images/spriteRoundedIconsSmallBl.png") no-repeat right top; - float: right; position: absolute; vertical-align: middle; right: 6px; @@ -52,7 +49,7 @@ width: 15px; cursor: pointer; } -.dj_ie6 .soria .dijitDialogCloseIcon { +.dj_ie .soria .dijitDialogCloseIcon { background : url("images/spriteRoundedIconsSmallBl.gif") no-repeat right top; } @@ -67,7 +64,6 @@ .soria .dijitTooltip, .soria .dijitTooltipDialog { /* the outermost dom node, holding the connector and container */ - opacity: 0.95; background: transparent; /* make the area on the sides of the arrow transparent */ } @@ -94,11 +90,6 @@ background-color: #fff; border:1px solid #cbcbcb; padding:0.45em; - /* - border-radius: 6px; - -moz-border-radius: 7px; - -webkit-border-radius: 6px; - */ } .soria .dijitTooltipConnector { @@ -123,7 +114,7 @@ height:11px; } -.dj_ie6 .soria .dijitTooltipBelow .dijitTooltipConnector { +.dj_ie .soria .dijitTooltipBelow .dijitTooltipConnector { background-image: url("images/tooltipConnectorUp.gif"); } @@ -135,6 +126,9 @@ width:17px; height:11px; } +.dj_ie .soria .dijitTooltipAbove .dijitTooltipConnector { + background-image: url("images/tooltipConnectorDown.gif"); +} .dj_ie6 .soria .dijitTooltipAbove .dijitTooltipConnector { background-image: url("images/tooltipConnectorDown.gif"); bottom: -5px; @@ -149,12 +143,12 @@ .soria .dijitTooltipLeft .dijitTooltipConnector { /* the arrow piece for tooltips to the left of an element, bottom borders aligned */ right: 0px; - bottom: 7px; + bottom: 3px; background:url("images/tooltipConnectorRight.png") no-repeat top left; width:11px; height:17px; } -.dj_ie6 .soria .dijitTooltipLeft .dijitTooltipConnector { +.dj_ie .soria .dijitTooltipLeft .dijitTooltipConnector { background-image: url("images/tooltipConnectorRight.gif"); } @@ -164,12 +158,12 @@ .soria .dijitTooltipRight .dijitTooltipConnector { /* the arrow piece for tooltips to the right of an element, bottom borders aligned */ left: 0px; - bottom: 7px; + bottom: 3px; background:url("images/tooltipConnectorLeft.png") no-repeat top left; width:11px; height:17px; } -.dj_ie6 .soria .dijitTooltipRight .dijitTooltipConnector { +.dj_ie .soria .dijitTooltipRight .dijitTooltipConnector { background-image: url("images/tooltipConnectorLeft.gif"); } diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/Dialog_rtl.css b/spring-js/src/main/resources/META-INF/dijit/themes/soria/Dialog_rtl.css index ea85d497..838700af 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/soria/Dialog_rtl.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/soria/Dialog_rtl.css @@ -1,29 +1,5 @@ /* Dialog */ -.dijitRtl .dijitDialogTitleBar .dijitDialogCloseIcon { - background-position: -60px top; - float: left; +.dijitRtl .soria .dijitDialogTitleBar .dijitDialogCloseIcon { right: auto; left: 5px; } - -/*FIXME: redundant?*/ -.dj_ie6 .dijitRtl .dijitDialogTitleBar .dijitDialogCloseIcon { - background-position: -60px top; -} - - -/* ToolTip */ - -.dj_ie .dijitRtl .dijitTooltipLeft { - margin-right: 0px; - margin-left: 13px; -} - -.dj_ie .dijitRtl .dijitTooltipRight { - margin-left: 26px; - margin-right: -13px; -} - -.dj_ie .dijitRtl .dijitTooltipDialog { - zoom:1 !important; -} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/Editor.css b/spring-js/src/main/resources/META-INF/dijit/themes/soria/Editor.css index b044e56a..8c3584ad 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/soria/Editor.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/soria/Editor.css @@ -1,60 +1,67 @@ -.dijitIEFixedToolbar { - position:absolute; - /* top:0; */ - top: expression(eval((document.documentElement||document.body).scrollTop)); -} - -.soria .dijitToolbar .dijitToolbarSeparator { - background: url('images/editor.gif'); -} - -/**** ICONS *****/ - -.soria .dijitEditorIcon { - background-image: url('images/editor.gif'); /* editor icons sprite image */ - background-repeat: no-repeat; - width: 18px; - height: 18px; - text-align: center; -} -.soria .dijitEditorIconSep { background-position: 0px; } -.soria .dijitEditorIconBackColor { background-position: -18px; } -.soria .dijitEditorIconBold { background-position: -36px; } -.soria .dijitEditorIconCancel { background-position: -54px; } -.soria .dijitEditorIconCopy { background-position: -72px; } -.soria .dijitEditorIconCreateLink { background-position: -90px; } -.soria .dijitEditorIconCut { background-position: -108px; } -.soria .dijitEditorIconDelete { background-position: -126px; } -.soria .dijitEditorIconForeColor { background-position: -144px; } -.soria .dijitEditorIconHiliteColor { background-position: -162px; } -.soria .dijitEditorIconIndent { background-position: -180px; } -.soria .dijitEditorIconInsertHorizontalRule { background-position: -198px; } -.soria .dijitEditorIconInsertImage { background-position: -216px; } -.soria .dijitEditorIconInsertOrderedList { background-position: -234px; } -.soria .dijitEditorIconInsertTable { background-position: -252px; } -.soria .dijitEditorIconInsertUnorderedList { background-position: -270px; } -.soria .dijitEditorIconItalic { background-position: -288px; } -.soria .dijitEditorIconJustifyCenter { background-position: -306px; } -.soria .dijitEditorIconJustifyFull { background-position: -324px; } -.soria .dijitEditorIconJustifyLeft { background-position: -342px; } -.soria .dijitEditorIconJustifyRight { background-position: -360px; } -.soria .dijitEditorIconLeftToRight { background-position: -378px; } -.soria .dijitEditorIconListBulletIndent { background-position: -396px; } -.soria .dijitEditorIconListBulletOutdent { background-position: -414px; } -.soria .dijitEditorIconListNumIndent { background-position: -432px; } -.soria .dijitEditorIconListNumOutdent { background-position: -450px; } -.soria .dijitEditorIconOutdent { background-position: -468px; } -.soria .dijitEditorIconPaste { background-position: -486px; } -.soria .dijitEditorIconRedo { background-position: -504px; } -.soria .dijitEditorIconRemoveFormat { background-position: -522px; } -.soria .dijitEditorIconRightToLeft { background-position: -540px; } -.soria .dijitEditorIconSave { background-position: -558px; } -.soria .dijitEditorIconSpace { background-position: -576px; } -.soria .dijitEditorIconStrikethrough { background-position: -594px; } -.soria .dijitEditorIconSubscript { background-position: -612px; } -.soria .dijitEditorIconSuperscript { background-position: -630px; } -.soria .dijitEditorIconUnderline { background-position: -648px; } -.soria .dijitEditorIconUndo { background-position: -666px; } -.soria .dijitEditorIconWikiword { background-position: -684px; } -.soria .dijitEditorIconToggleDir { background-position: -540px; /* padding: 0; margin: 0; color:#555555; - font-family:verdana,arial,sans-serif; font-weight: 800; font-size: 70%; */} +.dijitIEFixedToolbar { + position:absolute; + /* top:0; */ + top: expression(eval((document.documentElement||document.body).scrollTop)); +} + +.soria .dijitToolbar .dijitToolbarSeparator { + background: url('images/editor.gif'); +} + +/**** ICONS *****/ + +.soria .dijitEditorIcon { + background-image: url('images/editor.gif'); /* editor icons sprite image */ + background-repeat: no-repeat; + width: 18px; + height: 18px; + text-align: center; +} +.soria .dijitDisabled .dijitEditorIcon { + background-image: url('images/editorDisabled.gif'); /* editor icons sprite image */ +} + +.soria .dijitEditorIconSep { background-position: 0px; } +.soria .dijitEditorIconBackColor { background-position: -18px; } +.soria .dijitEditorIconBold { background-position: -36px; } +.soria .dijitEditorIconCancel { background-position: -54px; } +.soria .dijitEditorIconCopy { background-position: -72px; } +.soria .dijitEditorIconCreateLink { background-position: -90px; } +.soria .dijitEditorIconCut { background-position: -108px; } +.soria .dijitEditorIconDelete { background-position: -126px; } +.soria .dijitEditorIconForeColor { background-position: -144px; } +.soria .dijitEditorIconHiliteColor { background-position: -162px; } +.soria .dijitEditorIconIndent { background-position: -180px; } +.soria .dijitEditorIconInsertHorizontalRule { background-position: -198px; } +.soria .dijitEditorIconInsertImage { background-position: -216px; } +.soria .dijitEditorIconInsertOrderedList { background-position: -234px; } +.soria .dijitEditorIconInsertTable { background-position: -252px; } +.soria .dijitEditorIconInsertUnorderedList { background-position: -270px; } +.soria .dijitEditorIconItalic { background-position: -288px; } +.soria .dijitEditorIconJustifyCenter { background-position: -306px; } +.soria .dijitEditorIconJustifyFull { background-position: -324px; } +.soria .dijitEditorIconJustifyLeft { background-position: -342px; } +.soria .dijitEditorIconJustifyRight { background-position: -360px; } +.soria .dijitEditorIconLeftToRight { background-position: -378px; } +.soria .dijitEditorIconListBulletIndent { background-position: -396px; } +.soria .dijitEditorIconListBulletOutdent { background-position: -414px; } +.soria .dijitEditorIconListNumIndent { background-position: -432px; } +.soria .dijitEditorIconListNumOutdent { background-position: -450px; } +.soria .dijitEditorIconOutdent { background-position: -468px; } +.soria .dijitEditorIconPaste { background-position: -486px; } +.soria .dijitEditorIconRedo { background-position: -504px; } +.soria .dijitEditorIconRemoveFormat { background-position: -522px; } +.soria .dijitEditorIconRightToLeft { background-position: -540px; } +.soria .dijitEditorIconSave { background-position: -558px; } +.soria .dijitEditorIconSpace { background-position: -576px; } +.soria .dijitEditorIconStrikethrough { background-position: -594px; } +.soria .dijitEditorIconSubscript { background-position: -612px; } +.soria .dijitEditorIconSuperscript { background-position: -630px; } +.soria .dijitEditorIconUnderline { background-position: -648px; } +.soria .dijitEditorIconUndo { background-position: -666px; } +.soria .dijitEditorIconWikiword { background-position: -684px; } +.soria .dijitEditorIconToggleDir { background-position: -540px; /* padding: 0; margin: 0; color:#555555; + font-family:verdana,arial,sans-serif; font-weight: 800; font-size: 70%; */} +.soria .dijitEditorIconTabIndent { background-position: -702px; } +.soria .dijitEditorIconSelectAll { background-position: -720px; } +.soria .dijitEditorIconUnlink { background-position: -738px; } \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/Editor_rtl.css b/spring-js/src/main/resources/META-INF/dijit/themes/soria/Editor_rtl.css index 2a2df3e7..985fef9e 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/soria/Editor_rtl.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/soria/Editor_rtl.css @@ -1,9 +1,12 @@ /* Editor */ -.dijitRtl .dijitEditorIcon { +.dijitRtl .soria .dijitEditorIcon { background-image: url('images/editor_rtl.gif'); /* editor icons sprite image */ } +.dijitRtl .soria .dijitDisabled .dijitEditorIcon { + background-image: url('images/editorDisabled_rtl.gif'); /* editor icons sprite image */ +} /* Toolbar */ -.dijitRtl .dijitToolbar .dijitToolbarSeparator { +.dijitRtl .soria .dijitToolbar .dijitToolbarSeparator { background-image: url('images/editor_rtl.gif'); } diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/Menu.css b/spring-js/src/main/resources/META-INF/dijit/themes/soria/Menu.css index 41f8626e..e9f9bbd2 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/soria/Menu.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/soria/Menu.css @@ -9,7 +9,7 @@ .soria .dijitMenuItem { background-color: #fff; - font: menu; + font-family: sans-serif; margin: 0px; color: #243C5F; } @@ -32,20 +32,16 @@ } .soria .dijitMenuExpand { - display:none; -} -.soria .dijitMenuExpandEnabled { /* margin-top:4px; */ width:15px; height:15px; - background:url('images/spriteRoundedIconsSmall.png') no-repeat -30px top; + background-image: url('images/spriteRoundedIconsSmall.png'); + background-repeat: no-repeat; + background-position: -30px top; display:block; } -.dj_ie6 .soria .dijitMenuExpandEnabled { - background-image:url('images/spriteRoundedIconsSmall.gif'); -} -.soria .dijitMenuExpandInner { - display:none; +.dj_ie6 .soria .dijitMenuExpand { + background-image: url('images/spriteRoundedIconsSmall.gif'); } .soria .dijitMenuSeparator { @@ -60,4 +56,26 @@ .soria .dijitMenuSeparatorBottom { border-top: 1px solid #8ba0bd; +} + +/* the checked menu item */ +.soria .dijitCheckedMenuItemIconChar { + display: none; +} + +.soria .dijitCheckedMenuItemIcon { + background-image: url('images/spriteCheckbox.gif'); + background-position: -16px; +} + +.soria .dijitCheckedMenuItemIconChecked { + background-position: 0px; +} + +.soria .dijitMenuItemHover .dijitCheckedMenuItemIcon { + background-position: -80px; +} + +.soria .dijitMenuItemHover .dijitCheckedMenuItemIconChecked { + background-position: -64px; } \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/Menu_rtl.css b/spring-js/src/main/resources/META-INF/dijit/themes/soria/Menu_rtl.css index ac66852f..fd521af1 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/soria/Menu_rtl.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/soria/Menu_rtl.css @@ -1,15 +1,10 @@ - /* Menu */ -.dijitRtl .dijitMenuItem .dijitMenuItemIcon { +.dijitRtl .soria .dijitMenuItem .dijitMenuItemIcon { padding-left: 3px; padding-right: 0px; } -.dijitRtl .dijitMenuItem .dijitMenuExpandEnabled { - background-image:url('images/arrowLeft.png'); -} - -.dj_ie6 .dijitRtl .dijitMenuItem .dijitMenuExpandEnabled { - background-image:url('images/arrowLeft.gif'); +.dijitRtl .soria .dijitMenuItem .dijitMenuExpand { + background-position: left top; } diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/TimePicker.css b/spring-js/src/main/resources/META-INF/dijit/themes/soria/TimePicker.css new file mode 100644 index 00000000..5f985e98 --- /dev/null +++ b/spring-js/src/main/resources/META-INF/dijit/themes/soria/TimePicker.css @@ -0,0 +1,61 @@ +/* Time Picker */ +.soria .dijitTimePickerTick, +.soria .dijitTimePickerMarker { + border-color: #b1badf; +} + +.soria .dijitTimePickerTick { + color:white; +} + +.soria .dijitTimePickerMarker { + background:#bed7f0 url("images/titleBar.png") repeat-x top; + color:#293a4b; + font-weight: bold; +} + +.soria .dijitTimePickerItemSelected { + color: black; + background: #b9cbf1 none; +} + +.soria .dijitTimePickerItemHover { + background: #60a1ea none; + color:white; +} + +.soria .dijitTimePickerItemHover, +.soria .dijitTimePickerItemSelected { + position: relative; + z-index: 10; +} + +.soria .dijitTimePickerTick .dijitTimePickerItemInner { + font-size:0.4em; +} + +.soria .dijitTimePickerItemHover .dijitTimePickerItemInner, +.soria .dijitTimePickerItemSelected .dijitTimePickerItemInner { + font-size:1em; +} + +.soria .dijitTimePickerMarkerHover { + border-top: 1px solid #94b9ef; +} + +.soria .dijitTimePickerTickHover, +.soria .dijitTimePickerTickSelected { + margin-top:-0.3em; + margin-bottom:-0.3em; + border-bottom: none; +} + +.dijit_a11y .dijitTimePickerTickHover { + background-color: #CCC !important; + border-top: 1px solid #333 !important; + border-bottom: 1px solid #333 !important; +} + +.dijit_a11y .dijitTimePickerMarkerHover { + border-bottom-width: 2px; +} diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/TitlePane.css b/spring-js/src/main/resources/META-INF/dijit/themes/soria/TitlePane.css index a312a229..84a71700 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/soria/TitlePane.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/soria/TitlePane.css @@ -7,19 +7,20 @@ background: #cccccc; background:#fff url("images/titleBar.png") repeat-x top left; border:1px solid #bfbfbf; - padding:4px 4px 2px 4px; + padding:3px 4px; cursor: pointer; font-size: 0.9em; font-weight: bold; color: #6d6d6d; } -/* TODO: merge these, and all other icons to a series of background-image:() and background-position: -16*n px styles */ +.soria .dijitTitlePaneTitle * { + vertical-align: middle; +} + .soria .dijitTitlePane .dijitArrowNode { width:15px; height:15px; - float:right; - margin-top: -2px; } .soria .dijitTitlePaneFocused .dijitTitlePaneTextNode { @@ -32,10 +33,10 @@ } .soria .dijitTitlePane .dijitClosed .dijitArrowNode { - background: url('images/spriteRoundedIconsSmall.png') no-repeat top left; + background: url('images/spriteRoundedIconsSmall.png') no-repeat -30px top; } .dj_ie6 .soria .dijitTitlePane .dijitClosed .dijitArrowNode { - background:url('images/spriteRoundedIconsSmall.gif') no-repeat top left; + background:url('images/spriteRoundedIconsSmall.gif') no-repeat -30px top; } .soria .dijitTitlePane .dijitOpen .dijitArrowNode { background:url('images/spriteRoundedIconsSmall.png') no-repeat -15px top; @@ -44,19 +45,18 @@ background:url('images/spriteRoundedIconsSmall.gif') no-repeat -15px top; } .soria .dijitTitlePane .dijitArrowNodeInner { - visibility:hidden; + display:none; } + .dijit_a11y .dijitTitlePane .dijitArrowNodeInner { - visibility:visible; + display:inline !important; + font-family:monospace; + cursor: pointer; + padding-bottom:.2em; } -.soria .dijitTitlePaneTitle .dijitOpenCloseArrowOuter { - margin-right:5px; -} - -.soria .dijitOpen .dijitTitlePaneTitle .dijitOpenCloseArrowOuter { - position:relative; - top:2px; +.dijit_a11y .dijitTitlePane .dijitArrowNode { + display:none; } .soria .dijitTitlePaneContentOuter { @@ -72,6 +72,8 @@ .dj_ie6 .soria .dijitTitlePane .dijitTitlePaneTitle { zoom: 1; } -.soria .dijitClickableRegion { - background-color : #ffc !important; + +.soria .dijitTitlePaneTextNode { + margin-left: 4px; + margin-right: 4px; } \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/TitlePane_rtl.css b/spring-js/src/main/resources/META-INF/dijit/themes/soria/TitlePane_rtl.css index 52286bcd..82174fae 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/soria/TitlePane_rtl.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/soria/TitlePane_rtl.css @@ -1,6 +1,6 @@ -.dijitRtl .dijitTitlePane .dijitClosed .dijitArrowNode { - background-position: -30px top; +.dijitRtl .soria .dijitTitlePane .dijitClosed .dijitArrowNode { + background-position: 0px top; } -.dj_ie6 .dijitRtl .dijitTitlePane .dijitClosed .dijitArrowNode { - background-position: -30px top; +.dj_ie6-rtl .soria .dijitTitlePane .dijitClosed .dijitArrowNode { + background-position: 0px top; } \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/Toolbar.css b/spring-js/src/main/resources/META-INF/dijit/themes/soria/Toolbar.css index d6141b55..30498817 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/soria/Toolbar.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/soria/Toolbar.css @@ -1,32 +1,37 @@ .soria .dijitToolbar { - padding: 3px 0 1px 3px; border-bottom: 1px solid #ccc; background:#eaeaea url("images/titleBar.png") repeat-x top left; } -.soria .dijitToolbar .dijitButtonNode { +/* setting a min-height on ditor toolbar */ +.dj_ie6 .soria .dijitToolbar { + height: 10px; +} + +.soria .dijitToolbar .dijitButtonNode, +.soria .dijitToolbar .dijitComboButton .dijitButtonContents, +.soria .dijitToolbar .dijitComboButton .dijitDownArrowButton { background: none; - margin: 0px !important; - padding: 0px !important; + margin: 0px; + padding: 0px; border: none; font-size: 12px; } .soria .dijitToolbar .dijitButton, .soria .dijitToolbar .dijitToggleButton, -.soria .dijitToolbar .dijitDropDownButton { +.soria .dijitToolbar .dijitDropDownButton, +.soria .dijitToolbar .dijitComboButton .dijitButtonContents, +.soria .dijitToolbar .dijitComboButton .dijitDownArrowButton { background: none; - margin: 1px; - padding: 0px; - border: 1px solid transparent; + padding: 1px; /* on hover etc., margin replaced w/border */ } .soria .dijitToolbar .dijitButtonChecked, .soria .dijitToolbar .dijitToggleButtonChecked { background-color:#d8e5f8; border:1px solid #316ac5; - margin: 1px !important; - padding: 0px !important; + padding: 0px; } .soria .dijitToolbar .dijitButtonCheckedHover, @@ -34,15 +39,17 @@ { background-color:#9abbea; border:1px solid #316ac5; - margin: 1px !important; - padding: 0px !important; + padding: 0px; } .soria .dijitToolbar .dijitButtonHover, .soria .dijitToolbar .dijitToggleButtonHover, -.soria .dijitToolbar .dijitDropDownButtonHover { +.soria .dijitToolbar .dijitDropDownButtonHover, +.soria .dijitToolbar .dijitComboButtonHover .dijitButtonContents, +.soria .dijitToolbar .dijitComboButtonDownArrowHover .dijitDownArrowButton { /* TODO: change this from Hover to Selected so that button is still highlighted while drop down is being used */ border: 1px solid #316ac5; + padding: 0px; background-color:#9abbea; } @@ -54,42 +61,7 @@ .dj_ie .soria .dijitToolbar .dijitComboButton .dijitDownArrowButtonFocused, .dj_ff2 .soria.dijitToolbar .dijitComboButton .dijitButtonContentsFocused, .dj_ff2 .soria .dijitToolbar .dijitComboButton .dijitDownArrowButtonFocused { - border: 1px black dotted !important; + /* focus border doesn't appear on

for FF2 or IE, so need to add it manually */ + border: 1px #777 dotted !important; + padding: 0px; } - -/* IE6 specific rules */ -.dj_ie6 .soria .dijitToolbar .dijitButton, -.dj_ie6 .soria .dijitToolbar .dijitToggleButton, -.dj_ie6 .soria .dijitToolbar .dijitDropDownButton { - /* workaround no transparent border support in IE6 */ - margin: 2px; - padding: 0px 2px; - border: 0px; -} - -.dj_ie6 .soria .dijitToolbar .dijitButtonChecked, -.dj_ie6 .soria .dijitToolbar .dijitToggleButtonChecked, -.dj_ie6 .soria .dijitToolbar .dijitDropDownButtonChecked { - background-color:#d8e5f8; - border:1px solid #316ac5; - margin: 1px !important; - padding: 0px 2px !important; -} - -.dj_ie6 .soria .dijitToolbar .dijitButtonCheckedHover, -.dj_ie6 .soria .dijitToolbar .dijitToggleButtonCheckedHover, -.dj_ie6 .soria .dijitToolbar .dijitDropDownButtonCheckedHover { - background-color:#9abbea; - border:1px solid #316ac5; - margin: 1px !important; - padding: 0px 2px !important; -} - -.dj_ie6 .soria .dijitToolbar .dijitButtonHover, -.dj_ie6 .soria .dijitToolbar .dijitToggleButtonHover, -.dj_ie6 .soria .dijitToolbar .dijitDropDownButtonHover { - background-color:#9abbea; - border:1px solid #316ac5; - margin: 1px !important; - padding: 0px 2px !important; -} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/Tree.css b/spring-js/src/main/resources/META-INF/dijit/themes/soria/Tree.css index 13fd98d0..5c4d3a25 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/soria/Tree.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/soria/Tree.css @@ -16,7 +16,7 @@ .soria .dijitTreeLabel { font-weight: normal; - margin-left: 3px; + margin-left: 3px; } .soria .dijitTreeIsRoot { @@ -32,8 +32,6 @@ .soria .dijitTreeContent { min-height: 18px; min-width: 18px; - margin-left:18px; - padding-top:3px; padding-left:1px; } diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/Tree_rtl.css b/spring-js/src/main/resources/META-INF/dijit/themes/soria/Tree_rtl.css index a35d56d6..a35e879f 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/soria/Tree_rtl.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/soria/Tree_rtl.css @@ -1,38 +1,36 @@ /* Tree */ -.dijitRtl .dijitTreeContainer .dijitTreeNode { +.dijitRtl .soria .dijitTreeContainer .dijitTreeNode { background-image : url('images/treeI_rtl.gif'); background-position : top right; margin-left: auto; margin-right: 19px; } -.dijitRtl .dijitTreeContainer .dijitTreeIsRoot { +.dijitRtl .soria .dijitTreeContainer .dijitTreeIsRoot { margin-left: auto; margin-right: 0; background-image: none; } -.dijitRtl .dijitTreeContainer .dijitTreeIsLast { +.dijitRtl .soria .dijitTreeContainer .dijitTreeIsLast { background-image: url('images/treeI_half_rtl.gif'); } -.dijitRtl .dijitTreeContainer .dijitTreeContent { - margin-left: auto; - margin-right: 18px; +.dijitRtl .soria .dijitTreeContainer .dijitTreeContent { padding-left: auto; padding-right: 1px; } -.dijitRtl .dijitTreeContainer .dijitTreeExpandoOpened { +.dijitRtl .soria .dijitTreeContainer .dijitTreeExpandoOpened { background: url('images/spriteTree_rtl.gif') no-repeat -18px top; } -.dijitRtl .dijitTreeContainer .dijitTreeExpandoClosed { +.dijitRtl .soria .dijitTreeContainer .dijitTreeExpandoClosed { background-image: url('images/spriteTree_rtl.gif'); } -.dijitRtl .dijitTreeContainer .dijitTreeExpandoLeaf { +.dijitRtl .soria .dijitTreeContainer .dijitTreeExpandoLeaf { background: url('images/spriteTree_rtl.gif') no-repeat -36px top; } \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/form/Button.css b/spring-js/src/main/resources/META-INF/dijit/themes/soria/form/Button.css index 54ccdf1d..e0580a33 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/soria/form/Button.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/soria/form/Button.css @@ -9,17 +9,19 @@ .soria .dijitButtonNode { /* enabled state - inner */ /* border:1px outset #a0a0a0; */ - border:1px solid #8ba0bd; + border: 1px solid #8ba0bd; border-bottom:1px solid #657c9c; - border-right:1px solid #657c9c; - padding: 0.2em; - background:#bcd5f0 url("../images/buttonEnabled.png") repeat-x top left; -} -.dj_ie .soria .dijitButtonNode { - zoom: 1; + padding: 0.1em 0.2em 0.2em 0.2em; + background: #bcd5f0 url("../images/buttonEnabled.png") repeat-x top left; } +.soria .dijitButtonNode button { + border: 0px; + background-color: transparent; +} + .soria .dijitButtonText { + text-align: center; padding: 0 0.3em; } @@ -49,19 +51,12 @@ .soria .dijitSpinnerDisabled .dijitButtonNode { /* disabled state - inner */ border-color: #b9bbdd #b9bbdd #b9bbdd #b9bbdd; - /*color:#b4b4b4;*/ background:#c3d3e5 url("../images/buttonDisabled.png") top repeat-x; opacity: 0.60; /* Safari, Opera and Mozilla */ } -.dj_ie .soria .dijitButtonDisabled .dijitButtonNode *, -.dj_ie .soria .dijitToggleButtonDisabled .dijitButtonNode *, -.dj_ie .soria .dijitDropDownButtonDisabled .dijitButtonNode *, -.dj_ie .soria .dijitComboButtonDisabled .dijitButtonNode *, -.dj_ie .soria .dijitSpinnerDisabled .dijitButtonNode * { - filter: gray() alpha(opacity=50); /* IE */ -} .soria .dijitButtonHover .dijitButtonNode, +.soria .dijitButtonNodeHover, .soria .dijitToggleButtonHover .dijitButtonNode, .soria .dijitDropDownButtonHover .dijitButtonNode, .soria .dijitComboButtonHover .dijitButtonContents, @@ -71,7 +66,7 @@ .soria .dijitSpinnerDownArrowHover .dijitDownArrowButton { /* hover state - inner */ /* TODO: change from Hover to Selected so that button is still highlighted while drop down is being used */ - color:#000; + color:#243C5F; background:#acc5e2 url("../images/buttonHover.png") repeat-x top left; } @@ -106,4 +101,4 @@ .dj_ie6 .soria .dijitUpArrowButton .dijitArrowButtonInner { background:url("../images/spriteArrows.gif") no-repeat -22px top; width: 11px; -} \ No newline at end of file +} diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/form/Button_rtl.css b/spring-js/src/main/resources/META-INF/dijit/themes/soria/form/Button_rtl.css index a99cc721..31e0a55f 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/soria/form/Button_rtl.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/soria/form/Button_rtl.css @@ -1,3 +1,3 @@ -.dijitRtl .dijitComboBox .dijitButtonNode { +.dijitRtl .soria .dijitComboBox .dijitButtonNode { border-width: 0px 0px 0px 1px; } \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/form/Checkbox.css b/spring-js/src/main/resources/META-INF/dijit/themes/soria/form/Checkbox.css index 6ba5b086..7ad14112 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/soria/form/Checkbox.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/soria/form/Checkbox.css @@ -56,14 +56,12 @@ background-position: -32px; } -.soria .dijitCheckBoxHover, -.soria .dijitCheckBoxFocused { +.soria .dijitCheckBoxHover { /* hovering over an unchecked enabled checkbox */ background-position: -80px; } -.soria .dijitCheckBoxCheckedHover, - .soria .dijitCheckBoxCheckedFocused { +.soria .dijitCheckBoxCheckedHover { /* hovering over a checked enabled checkbox */ background-position: -64px; } \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/form/ComboBox.css b/spring-js/src/main/resources/META-INF/dijit/themes/soria/form/ComboBox.css index 71e79e86..a602c90b 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/soria/form/ComboBox.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/soria/form/ComboBox.css @@ -2,6 +2,11 @@ background:url("../images/spriteArrows.png") no-repeat left center; width: 11px; } + +.dj_ie6 .soria .dijitComboBox .dijitArrowButton .dijitArrowButtonInner { + background:url("../images/spriteArrows.gif") no-repeat left center; +} + .soria .dijitComboBoxHover .dijitArrowButtonInner { /* TODO: url("images/arrowDownHover.png") but in IE6 it flickers some? */ } \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/form/Common.css b/spring-js/src/main/resources/META-INF/dijit/themes/soria/form/Common.css index 1aaf6a4d..e6d63b59 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/soria/form/Common.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/soria/form/Common.css @@ -27,11 +27,31 @@ Otherwise the actual input element. */ background:#fff url("../images/validationInputBg.png") repeat-x top left; - #background:#fff url('../images/validationInputBg.gif') repeat-x top left; border:1px solid #8ba0bd; line-height: normal; } +.dj_ie6 .soria .dijitTextBox, +.dj_ie6 .soria .dijitComboBox, +.dj_ie6 .soria .dijitSpinner, +.dj_ie6 .soria .dijitInlineEditor input, +.dj_ie6 .soria .dijitTextArea { + background:#fff url('../images/validationInputBg.gif') repeat-x top left; +} + +.soria .dijitTextBoxDisabled, +.soria .dijitComboBoxDisabled, +.soria .dijitSpinnerDisabled, +.soria .dijitTextAreaDisabled { + color: gray; +} +.dj_safari .soria .dijitTextBoxDisabled, +.dj_safari .soria .dijitComboBoxDisabled, +.dj_safari .soria .dijitSpinnerDisabled, +.dj_safari .soria .dijitTextareaDisabled { + color: #eee; +} + .soria .dijitComboBox .dijitButtonNode { padding: 0 0.2em; } @@ -44,7 +64,8 @@ .soria .dijitTextBoxFocused, .soria .dijitComboBoxFocused, -.soria .dijitSpinnerFocused { +.soria .dijitSpinnerFocused, +.soria .dijitTextAreaFocused { /* input field when focused (ie: typing affects it) */ border-color:#406b9b; } @@ -80,3 +101,8 @@ width: 16px; background: transparent url('../images/warning.png') no-repeat center center; } + +/* The highlight is shown in the ComboBox menu. */ +.soria .dijitComboBoxHighlightMatch { + background-color:#f9f7ba; +} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/form/Common_rtl.css b/spring-js/src/main/resources/META-INF/dijit/themes/soria/form/Common_rtl.css index 22d6b34b..6d518122 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/soria/form/Common_rtl.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/soria/form/Common_rtl.css @@ -1,5 +1,5 @@ -.dijitRtl .dijitComboBox .dijitButtonNode, -.dijitRtl .dijitSpinner .dijitButtonNode { +.dijitRtl .soria .dijitComboBox .dijitButtonNode, +.dijitRtl .soria .dijitSpinner .dijitButtonNode { /* line between the input area and the drop down button */ border-color: #8ba0bd; border-left: 0px solid #8ba0bd; diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/form/RadioButton.css b/spring-js/src/main/resources/META-INF/dijit/themes/soria/form/RadioButton.css index 0ecd7e49..2b9b7852 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/soria/form/RadioButton.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/soria/form/RadioButton.css @@ -55,14 +55,12 @@ background-position: -32px; } -.soria .dijitRadioHover, -.soria .dijitRadioFocused { +.soria .dijitRadioHover { /* hovering over an unselected enabled radio button */ background-position: -80px; } -.soria .dijitRadioCheckedHover, -.soria .dijitRadioCheckedFocused { +.soria .dijitRadioCheckedHover { /* hovering over a selected enabled radio button */ background-position: -64px; } \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/form/Slider.css b/spring-js/src/main/resources/META-INF/dijit/themes/soria/form/Slider.css index dad393da..e168577b 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/soria/form/Slider.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/soria/form/Slider.css @@ -1,136 +1,141 @@ - -/**** - SLIDER -****/ - -.soria .dijitSliderProgressBarH { - border-color: #b1badf; - background: #c0c2c5 url("../images/sliderFull.png") repeat-x top left; -} - -.soria .dijitSliderProgressBarV { - border-color: #b1badf; - background: #c0c2c5 url("../images/sliderFullVertical.png") repeat-y bottom left; -} - -.soria .dijitSliderFocused .dijitSliderProgressBarH, -.soria .dijitSliderFocused .dijitSliderLeftBumper { - background-image:url("../images/sliderFullFocus.png"); -} - -.soria .dijitSliderFocused .dijitSliderProgressBarV, -.soria .dijitSliderFocused .dijitSliderBottomBumper { - background-image:url("../images/sliderFullVerticalFocus.png"); -} - -.soria .dijitSliderRemainingBarV { - border-color: #b4b4b4; - background: #dcdcdc url("../images/sliderEmptyVertical.png") repeat-y bottom left; -} - -.soria .dijitSliderRemainingBarH { - border-color: #b4b4b4; - background: #dcdcdc url("../images/sliderEmpty.png") repeat-x top left; -} - -.soria .dijitSliderBar { - border-style: solid; - outline:1px; - /* border-color: #b4b4b4; */ -} -.soria .dijitSliderFocused .dijitSliderBar { - border-color:#8ba0bd; -} - -.dijit_a11y .dijitSliderProgressBar { - background-color:#333 !important; -} - -.soria .dijitSliderImageHandleH { - border:0px; - width:15px; - height:18px; - background:url("../images/preciseSliderThumb.png") no-repeat center top; - cursor:pointer; -} -.soria .dijitSliderFocused .dijitSliderImageHandleH { - background-image:url("../images/preciseSliderThumbFocus.png"); - #background-image:url("../images/preciseSliderThumbFocus.gif"); -} - -.dj_ie6 .soria .dijitSliderImageHandleH { - background-image:url("../images/preciseSliderThumb.gif"); -} - -.soria .dijitSliderLeftBumper { - border-left-width: 1px; - border-color: #aab0bb; - background: #c0c2c5 url("../images/sliderFull.png") repeat-x top left; -} - -.soria .dijitSliderRightBumper { - background: #dcdcdc url("../images/sliderEmpty.png") repeat-x top left; - border-color: #b4b4b4; - border-right-width: 1px; -} - -.soria .dijitSliderImageHandleV { - border:0px; - width:20px; - height:15px; - background:url("../images/sliderThumb.png") no-repeat center center; - cursor:pointer; -} - -.soria .dijitSliderFocused .dijitSliderImageHandleV { - background-image:url("../images/sliderThumbFocus.png"); -} -.dj_ie6 .soria .dijitSliderFocused .dijitSliderImageHandleV { - background-image:url("../images/sliderThumbFocus.gif"); -} - -.soria .dijitSliderBottomBumper { - border-bottom-width: 1px; - border-color: #aab0bb; - background: #c0c2c5 url("../images/sliderFullVertical.png") repeat-y bottom left; -} - -.soria .dijitSliderTopBumper { - background: #dcdcdc url("../images/sliderEmptyVertical.png") repeat-y top left; - border-color: #b4b4b4; - border-top-width: 1px; -} - -.soria .dijitSliderIncrementIconH, -.soria .dijitSliderIncrementIconV { - background:url('../images/spriteRoundedIconsSmall.png') no-repeat -45px top; - width:15px; height:15px; - cursor:pointer; -} -.soria .dijitSliderIncrementIconH { - background:url('../images/spriteRoundedIconsSmall.png') no-repeat -30px top; -} - -.soria .dijitSliderDecrementIconH, -.soria .dijitSliderDecrementIconV { - width:15px; - height:15px; - cursor:pointer; - background:url('../images/spriteRoundedIconsSmall.png') no-repeat -15px top; -} -.soria .dijitSliderDecrementIconH { background:url('../images/spriteRoundedIconsSmall.png') no-repeat 0px top; } - -.soria .dijitSliderButtonInner { - visibility:hidden; -} - -.soria .dijitSliderDisabled { - opacity:0.6 !important; -} - -.dj_ie6 .soria .dijitSliderDisabled, -.dj_ie6 .soria .dijitSliderDisabled .dijitRuleContainer, -.dj_ie6 .soria .dijitSliderDisabled .dijitSliderRemainingBar, -.dj_ie6 .soria .dijitSliderDisabled .dijitSliderProgressBar { - filter: gray() alpha(opacity=40); + +/**** + SLIDER +****/ + +.soria .dijitSliderProgressBarH { + border-color: #b1badf; + background: #c0c2c5 url("../images/sliderFull.png") repeat-x top left; +} + +.soria .dijitSliderProgressBarV { + border-color: #b1badf; + background: #c0c2c5 url("../images/sliderFullVertical.png") repeat-y bottom left; +} + +.soria .dijitSliderFocused .dijitSliderProgressBarH, +.soria .dijitSliderFocused .dijitSliderLeftBumper { + background-image:url("../images/sliderFullFocus.png"); +} + +.soria .dijitSliderFocused .dijitSliderProgressBarV, +.soria .dijitSliderFocused .dijitSliderBottomBumper { + background-image:url("../images/sliderFullVerticalFocus.png"); +} + +.soria .dijitSliderRemainingBarV { + border-color: #b4b4b4; + background: #dcdcdc url("../images/sliderEmptyVertical.png") repeat-y bottom left; +} + +.soria .dijitSliderRemainingBarH { + border-color: #b4b4b4; + background: #dcdcdc url("../images/sliderEmpty.png") repeat-x top left; +} + +.soria .dijitSliderBar { + border-style: solid; + outline:1px; + /* border-color: #b4b4b4; */ +} +.soria .dijitSliderFocused .dijitSliderBar { + border-color:#8ba0bd; +} + +.dijit_a11y .dijitSliderProgressBar { + background-color:#333 !important; +} + +.soria .dijitSliderImageHandleH { + border:0px; + width:15px; + height:18px; + background:url("../images/preciseSliderThumb.png") no-repeat center top; + cursor:pointer; +} +.soria .dijitSliderFocused .dijitSliderImageHandleH { + background-image:url("../images/preciseSliderThumbFocus.png"); + #background-image:url("../images/preciseSliderThumbFocus.gif"); +} + +.dj_ie6 .soria .dijitSliderImageHandleH { + background-image:url("../images/preciseSliderThumb.gif"); +} + +.soria .dijitSliderLeftBumper { + border-left-width: 1px; + border-color: #aab0bb; + background: #c0c2c5 url("../images/sliderFull.png") repeat-x top left; +} + +.soria .dijitSliderRightBumper { + background: #dcdcdc url("../images/sliderEmpty.png") repeat-x top left; + border-color: #b4b4b4; + border-right-width: 1px; +} + +.soria .dijitSliderImageHandleV { + border:0px; + width:20px; + height:15px; + background:url("../images/sliderThumb.png") no-repeat center center; + #background:url("../images/sliderThumb.gif") no-repeat center center; + cursor:pointer; +} + +.soria .dijitSliderFocused .dijitSliderImageHandleV { + background-image:url("../images/sliderThumbFocus.png"); + #background-image:url("../images/sliderThumbFocus.gif"); +} + +.soria .dijitSliderBottomBumper { + border-bottom-width: 1px; + border-color: #aab0bb; + background: #c0c2c5 url("../images/sliderFullVertical.png") repeat-y bottom left; +} + +.soria .dijitSliderTopBumper { + background: #dcdcdc url("../images/sliderEmptyVertical.png") repeat-y top left; + border-color: #b4b4b4; + border-top-width: 1px; +} + +.soria .dijitSliderIncrementIconH, +.soria .dijitSliderIncrementIconV { + background:url('../images/spriteRoundedIconsSmall.png') no-repeat -45px top; + #background:url('../images/spriteRoundedIconsSmall.gif') no-repeat -45px top; + width:15px; height:15px; + cursor:pointer; +} +.soria .dijitSliderIncrementIconH { + background:url('../images/spriteRoundedIconsSmall.png') no-repeat -30px top; + #background:url('../images/spriteRoundedIconsSmall.gif') no-repeat -30px top; +} + +.soria .dijitSliderDecrementIconH, +.soria .dijitSliderDecrementIconV { + width:15px; + height:15px; + cursor:pointer; + background:url('../images/spriteRoundedIconsSmall.png') no-repeat -15px top; + #background:url('../images/spriteRoundedIconsSmall.gif') no-repeat -15px top; +} +.soria .dijitSliderDecrementIconH { + background:url('../images/spriteRoundedIconsSmall.png') no-repeat 0px top; + #background:url('../images/spriteRoundedIconsSmall.gif') no-repeat 0px top; +} + +.soria .dijitSliderButtonInner { + visibility:hidden; +} + +.soria .dijitSliderDisabled { + opacity:0.6 !important; +} + +.dj_ie6 .soria .dijitSliderDisabled, +.dj_ie6 .soria .dijitSliderDisabled .dijitRuleContainer, +.dj_ie6 .soria .dijitSliderDisabled .dijitSliderRemainingBar, +.dj_ie6 .soria .dijitSliderDisabled .dijitSliderProgressBar { + filter: gray() alpha(opacity=40); } \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/form/Slider_rtl.css b/spring-js/src/main/resources/META-INF/dijit/themes/soria/form/Slider_rtl.css index 069d4fec..2f7a08a9 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/soria/form/Slider_rtl.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/soria/form/Slider_rtl.css @@ -1,34 +1,36 @@ - -/* Slider */ - -.dijitRtl .dijitSliderProgressBarH, -.dijitRtl .dijitSliderRemainingBarH, -.dijitRtl .dijitSliderLeftBumper, -.dijitRtl .dijitSliderRightBumper, -.dijitRtl .dijitSliderTopBumper { - background-position: top right; -} - -.dijitRtl .dijitSliderProgressBarV, -.dijitRtl .dijitSliderRemainingBarV, -.dijitRtl .dijitSliderBottomBumper { - background-position: bottom right; -} - -.dijitRtl .dijitSliderLeftBumper { - border-left-width: 0px; - border-right-width: 1px; -} - -.dijitRtl .dijitSliderRightBumper { - border-left-width: 1px; - border-right-width: 0px; -} - -.dijitRtl .dijitSliderIncrementIconH { - background-image:url('../images/arrowLeft.png'); -} - -.dijitRtl .dijitSliderDecrementIconH { - background-image:url('../images/arrowRight.png'); -} + +/* Slider */ + +.dijitRtl .soria .dijitSliderProgressBarH, +.dijitRtl .soria .dijitSliderRemainingBarH, +.dijitRtl .soria .dijitSliderLeftBumper, +.dijitRtl .soria .dijitSliderRightBumper, +.dijitRtl .soria .dijitSliderTopBumper { + background-position: top right; +} + +.dijitRtl .soria .dijitSliderProgressBarV, +.dijitRtl .soria .dijitSliderRemainingBarV, +.dijitRtl .soria .dijitSliderBottomBumper { + background-position: bottom right; +} + +.dijitRtl .soria .dijitSliderLeftBumper { + border-left-width: 0px; + border-right-width: 1px; +} + +.dijitRtl .soria .dijitSliderRightBumper { + border-left-width: 1px; + border-right-width: 0px; +} + +.dijitRtl .soria .dijitSliderIncrementIconH { + background:url('../images/spriteRoundedIconsSmall.png') no-repeat left top; + #background:url('../images/spriteRoundedIconsSmall.gif') no-repeat left top; +} + +.dijitRtl .soria .dijitSliderDecrementIconH { + background:url('../images/spriteRoundedIconsSmall.png') no-repeat -30px top; + #background:url('../images/spriteRoundedIconsSmall.gif') no-repeat -30px top; +} diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/images/editor.gif b/spring-js/src/main/resources/META-INF/dijit/themes/soria/images/editor.gif index 7fe7052c..127c9c43 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/soria/images/editor.gif and b/spring-js/src/main/resources/META-INF/dijit/themes/soria/images/editor.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/images/editorDisabled.gif b/spring-js/src/main/resources/META-INF/dijit/themes/soria/images/editorDisabled.gif new file mode 100644 index 00000000..9dc51036 Binary files /dev/null and b/spring-js/src/main/resources/META-INF/dijit/themes/soria/images/editorDisabled.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/images/editorDisabled_rtl.gif b/spring-js/src/main/resources/META-INF/dijit/themes/soria/images/editorDisabled_rtl.gif new file mode 100644 index 00000000..74d407af Binary files /dev/null and b/spring-js/src/main/resources/META-INF/dijit/themes/soria/images/editorDisabled_rtl.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/images/editor_rtl.gif b/spring-js/src/main/resources/META-INF/dijit/themes/soria/images/editor_rtl.gif index ef049380..b94d040b 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/soria/images/editor_rtl.gif and b/spring-js/src/main/resources/META-INF/dijit/themes/soria/images/editor_rtl.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/images/progressBarAnim.gif b/spring-js/src/main/resources/META-INF/dijit/themes/soria/images/progressBarAnim.gif index 167a3e0d..73e25e17 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/soria/images/progressBarAnim.gif and b/spring-js/src/main/resources/META-INF/dijit/themes/soria/images/progressBarAnim.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/images/sliderThumb.gif b/spring-js/src/main/resources/META-INF/dijit/themes/soria/images/sliderThumb.gif new file mode 100644 index 00000000..29899a4b Binary files /dev/null and b/spring-js/src/main/resources/META-INF/dijit/themes/soria/images/sliderThumb.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/images/tooltipConnectorRight.png b/spring-js/src/main/resources/META-INF/dijit/themes/soria/images/tooltipConnectorRight.png index ed6efc46..64190eef 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/soria/images/tooltipConnectorRight.png and b/spring-js/src/main/resources/META-INF/dijit/themes/soria/images/tooltipConnectorRight.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/images/treeExpand_loading.gif b/spring-js/src/main/resources/META-INF/dijit/themes/soria/images/treeExpand_loading.gif index b6d53b9d..db9ddd02 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/soria/images/treeExpand_loading.gif and b/spring-js/src/main/resources/META-INF/dijit/themes/soria/images/treeExpand_loading.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/layout/AccordionContainer.css b/spring-js/src/main/resources/META-INF/dijit/themes/soria/layout/AccordionContainer.css index 903a0580..a31f2247 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/soria/layout/AccordionContainer.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/soria/layout/AccordionContainer.css @@ -7,6 +7,25 @@ border-color: #b1badf; } +/* nested classes */ + +.soria .dijitTabContainer-dijitAccordionContainer { + border: none; +} + +.soria .dijitAccordionContainer-dijitAccordionContainer { + border: none; + background-color: #fff; +} + +.soria .dijitSplitContainer-dijitAccordionContainer, +.soria .dijitBorderContainer-dijitAccordionContainer { + border: 1px #B1BADF solid; + background-color: #fff; +} + +/* common */ + .soria .dijitAccordionPane { background-color: #e7e7e7; font-size: 0.9em; @@ -32,7 +51,7 @@ } .soria .dijitAccordionArrow { - background:url("../images/spriteRoundedIconsSmallBl.gif") no-repeat; + background:url("../images/spriteRoundedIconsSmallBl.gif") no-repeat -30px top; width:15px; height:15px; margin-top:-1px; @@ -43,6 +62,10 @@ margin-top:-1px; } +.soria .dijitAccordionText { + margin-left: 4px; + margin-right: 4px; +} .soria .dijitAccordionBody { background: #fff; } \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/layout/AccordionContainer_rtl.css b/spring-js/src/main/resources/META-INF/dijit/themes/soria/layout/AccordionContainer_rtl.css index 4ceda54c..f3574603 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/soria/layout/AccordionContainer_rtl.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/soria/layout/AccordionContainer_rtl.css @@ -1,3 +1,8 @@ -.dijitRtl .dijitAccordionArrow { - background-position: -30px top; +.dijitRtl .soria .dijitAccordionArrow { + background-position: 0px top; +} + +.dijitRtl .soria .dijitAccordionTitle-selected .dijitAccordionArrow { + /* same rule as LTR mode, just listed to override previous rule in this file */ + background-position: -15px top; } diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/layout/BorderContainer.css b/spring-js/src/main/resources/META-INF/dijit/themes/soria/layout/BorderContainer.css index f24c7408..3ce59552 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/soria/layout/BorderContainer.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/soria/layout/BorderContainer.css @@ -1,34 +1,57 @@ -/** - * dijit.layout.BorderContainer - * - */ - -.soria .dijitSplitterH { - background:url("../images/splitContainerSizerH.png") repeat-x #fff; - border:0; - border-left:0px solid #d3d3d3; - border-right:0px solid #d3d3d3; - height:5px; -} - -.soria .dijitSplitterH .dijitSplitterThumb { - background:url("../images/splitContainerSizerH-thumb.png") no-repeat; - top:1px; - width:19px; - height:2px; -} - -.soria .dijitSplitterV { - background:url("../images/splitContainerSizerV.png") repeat-y #fff; - border:0; - border-top:0px solid #d3d3d3; - border-bottom:0px solid #d3d3d3; - width:5px; -} - -.soria .dijitSplitterV .dijitSplitterThumb { - background:url("../images/splitContainerSizerV-thumb.png") no-repeat; - left:1px; - height:19px; - width:5px; +/** + * dijit.layout.BorderContainer + * + */ + +.soria .dijitBorderContainer { + background-color: #e1ebfb; + padding: 5px; +} + +.soria .dijitBorderContainer-dijitBorderContainer { + border: none; + padding: 0px; +} + +.soria .dijitSplitterH, +.soria .dijitGutterH { + background: #E1EBFB; + border:0; + border-left:0px solid #d3d3d3; + border-right:0px solid #d3d3d3; + height:5px; +} + +.soria .dijitSplitterH .dijitSplitterThumb { + background:url("../images/splitContainerSizerH-thumb.png") no-repeat; + top:1px; + width:19px; + height:2px; +} + +.soria .dijitSplitterV, +.soria .dijitGutterV { + background: #E1EBFB; + border:0; + border-top:0px solid #d3d3d3; + border-bottom:0px solid #d3d3d3; + width:5px; +} + +.soria .dijitSplitterV .dijitSplitterThumb { + background:url("../images/splitContainerSizerV-thumb.png") no-repeat; + left:1px; + height:19px; + width:5px; +} + +/* active splitter */ +.soria .dijitSplitterActive { + font-size: 1px; + background-image: none; + background-color: #aaa; + -moz-opacity: 0.6; + opacity: 0.6; + filter: Alpha(Opacity=60); + margin: 0; } \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/layout/ContentPane.css b/spring-js/src/main/resources/META-INF/dijit/themes/soria/layout/ContentPane.css new file mode 100644 index 00000000..c1697874 --- /dev/null +++ b/spring-js/src/main/resources/META-INF/dijit/themes/soria/layout/ContentPane.css @@ -0,0 +1,23 @@ +/* ContentPane */ + +.soria .dijitContentPane { + padding: 0px; +} + +/* nested layouts */ +.soria .dijitTabContainerTop-dijitContentPane, +.soria .dijitTabContainerLeft-dijitContentPane, +.soria .dijitTabContainerBottom-dijitContentPane, +.soria .dijitTabContainerRight-dijitContentPane, +.soria .dijitAccordionContainer-dijitContentPane { + border: none; + background-color: #fff; + padding: 5px; +} + +.soria .dijitSplitContainer-dijitContentPane, +.soria .dijitBorderContainer-dijitContentPane { + border: 1px #B1BADF solid; + background-color: #fff; + padding: 5px; +} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/layout/TabContainer.css b/spring-js/src/main/resources/META-INF/dijit/themes/soria/layout/TabContainer.css index c559cfcf..7bd90018 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/soria/layout/TabContainer.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/soria/layout/TabContainer.css @@ -8,41 +8,42 @@ /* Classes for all types of tabs (top/bottom/left/right) */ -.soria .dijitTabPaneWrapper { /* Container for tab content */ - /* - overflow: hidden; - */ +/* Tabs, shared classes */ +.soria .dijitTabPaneWrapper { background:#fff; - border:1px solid #b1badf; + border:1px solid #B1BADF; + margin: 0; + padding-left: 0px; } -.soria .dijitTab { - line-height:normal; - margin-right:3px; /* space between one tab and the next in top/bottom mode */ - padding:0px; - background: url("../images/tabContainerSprite.gif") no-repeat 0 -300px; - font-size: 0.9em; - font-weight: bold; - color: #373941; - margin-bottom: -1px; -} - -.soria dijitTabChecked { - margin-bottom: -2px; -} - -.soria .dijitTabInnerDiv .dijitTabContent { - padding:8px 10px 4px 10px; - background: url("../images/tabContainerSprite.gif") repeat-x 0 -350px; -} .soria .dijitTabInnerDiv { - padding:0px 10px 0px 10px; + padding:0px 3px 0px 0px; + margin: 0 0 0 4px; background: url("../images/tabContainerSprite.gif") no-repeat; background-position: right -400px; - border: none; } +.soria .dijitTab { + line-height:normal; + margin:0 2px 0 0; /* space between one tab and the next in top/bottom mode */ + padding:0px; + background: url("../images/tabContainerSprite.gif") no-repeat 0 -300px; + color: #243C5F; + border-bottom: 1px #B1BADF solid; +} + +.soria .dijitTabInnerDiv .dijitTabContent { + padding:5px 3px 4px 4px; + background: url("../images/tabContainerSprite.gif") repeat-x 0 -350px; + position: relative; +} + +.dijitTabSpacer { + font-size: 1px; +} + +/* hovered tab */ .soria .dijitTabHover, .soria .dijitTabCloseButtonHover { color: #243C5F; @@ -52,15 +53,14 @@ .soria .dijitTabHover .dijitTabInnerDiv, .soria .dijitTabCloseButtonHover .dijitTabInnerDiv { background: url("../images/tabContainerSprite.gif") no-repeat right -250px; - border: none; } .soria .dijitTabHover .dijitTabInnerDiv .dijitTabContent, .soria .dijitTabCloseButtonHover .dijitTabInnerDiv .dijitTabContent { background: url("../images/tabContainerSprite.gif") repeat-x 0 -200px; - padding:8px 10px 4px 10px; } +/* checked tab*/ .soria .dijitTabChecked, .soria .dijitTabCloseButtonChecked { @@ -69,304 +69,307 @@ } .soria .dijitTabChecked .dijitTabInnerDiv { - padding:0px 10px 0px 10px; background: url("../images/tabContainerSprite.gif") no-repeat right -100px; - border: none; } .soria .dijitTabChecked .dijitTabInnerDiv .dijitTabContent { background: url("../images/tabContainerSprite.gif") repeat-x 0 -50px; - padding:8px 10px 5px 10px; color: #243C5F !important; } -/* top specific classes */ +.soria .dijitTab .dijitClosable .closeNode { + /* Inline-block */ + display:-moz-inline-box; /* FF2 */ + display:inline-block; /* webkit and FF3 */ + #zoom: 1; /* set hasLayout:true to mimic inline-block */ + #display:inline; /* don't use .dj_ie since that increases the priority */ + vertical-align:top; + width: 1.25em; + height: 1.25em; + padding: 0; + margin: 0; +} -.soria .dijitTabLabels-top { - border-left: 1px solid #b1badf; - border-top: 1px solid #b1badf; - border-right: 1px solid #b1badf; +.soria .dijitTab .dijitClosable .closeImage { + width: 15px; + height: 15px; + background: url("../images/spriteRoundedIconsSmall.png") no-repeat -60px top; +} + +.dj_ie6 .dijitTab .dijitClosable .closeImage { + background: url("../images/spriteRoundedIconsSmall.gif") no-repeat -60px top; +} + +.soria .dijitTabCloseButton .dijitClosable .closeImage { + background: url("../images/spriteRoundedIconsSmall.png") no-repeat -60px top; +} +.dj_ie6 .soria .dijitTabCloseButton .dijitClosable .closeImage { + background: url("../images/spriteRoundedIconsSmall.gif") no-repeat -60px top; +} + +.soria .dijitTabCloseButtonHover .dijitClosable .closeImage { + background: url("../images/spriteRoundedIconsSmall.png") no-repeat -60px top; +} +.dj_ie6 .soria .dijitTabCloseButtonHover .dijitClosable .closeImage { + background: url("../images/spriteRoundedIconsSmall.gif") no-repeat -60px top; +} + +.soria .dijitTab .dijitTabButtonSpacer { + height: 15px; + width: 1px; +} + +/* ================================ */ +/* top tabs */ +.soria .dijitTabContainerTop-tabs { + margin-bottom: -1px; + border-color: #ccc; + padding-left: 3px; +} + +/* top container */ +.soria .dijitTabContainerTop-container { + border-top: none; +} + +/* checked tabs */ +.soria .dijitTabContainerTop-tabs .dijitTabChecked { + border-bottom-color: #94b4e6; +} + +/* strip */ +.soria .dijitTabContainerTopStrip { + border: 1px solid #B1BADF; padding-top: 2px; - padding-left: 3px; - padding-right: 3px; - background: #F0F4FC url("../images/tabStripe.gif") repeat-x left bottom; - padding-bottom: 4px; -} -/* -.soria .dijitAlignTop .dijitTabStripe { - background: url("../images/tabStripe.gif") repeat-x left bottom; - padding-left: 2px; - padding-top: 0px; - height: 4px; - clear: both; - font-size: 1px; - margin-left: -3px; -} -*/ - -.soria .dijitAlignLeft .dijitTab, -.soria .dijitAlignRight .dijitTab { - margin-right:0px; - margin-bottom:5px; /* space between one tab and the next in left/right mode */ + padding-left: 3px; } -/* make the active tab white on the side next to the content pane */ -.soria .dijitAlignTop .dijitTabChecked, -.soria .dijitAlignTop .dijitTabCloseButtonChecked -{ - border-bottom-color:white; - vertical-align:bottom; +.soria .dijitTabContainerTopStrip { + background: #F0F4FC; } -.soria .dijitAlignBottom .dijitTabChecked, -.soria .dijitAlignBottom .dijitTabCloseButtonChecked -{ - border-top-color:white; - /*-moz-border-radius:2px 2px 0px 0px; eliminate some border detritrus on moz */ +/* ================================ */ +/* bottom tabs */ +.soria .dijitTabContainerBottom-tabs { + margin-top: -1px; + border-color: #ccc; + padding-left: 3px; } -.soria .dijitAlignLeft .dijitTabChecked, -.soria .dijitAlignLeft .dijitTabCloseButtonChecked -{ - border-right-color:white; +/* bottom container */ +.soria .dijitTabContainerBottom-container { + border-bottom: none; } -.soria .dijitAlignRight .dijitTabChecked, -.soria .dijitAlignRight .dijitTabCloseButtonChecked -{ - border-left-color:white; -} - -/* bottom specific classes */ - -.soria .dijitTabLabels-bottom { - padding-bottom: 2px; - padding-left: 3px; - background-color: #f0f4fc; - border-left: 1px solid #b1badf; - border-bottom: 1px solid #b1badf; - border-right: 1px solid #b1badf; - background: #F0F4FC url("../images/tabStripeBottom.gif") repeat-x left top; - padding-top: 3px; - padding-right: 3px; -} -/* -.soria .dijitAlignBottom .dijitTabStripe { - background: url("../images/tabStripe.gif") repeat-x left bottom; - padding-left: 2px; - padding-top: 0px; - height: 4px; - clear: both; - font-size: 1px; - margin-left: -3px; -} -*/ -.soria .dijitAlignBottom .dijitTab { - line-height:normal; - margin-right:3px; /* space between one tab and the next in top/bottom mode */ - padding:0px; +.soria .dijitTabContainerBottom-tabs .dijitTab { + border-bottom: none; + border-top: 1px solid #B1BADF; background: url("../images/tabBottomEnabledSpriteLR.gif") no-repeat bottom left; - font-size: 0.9em; - font-weight: bold; - color: #373941; - margin-bottom: 0px; - margin-top: 1px; } -.soria .dijitAlignBottom .dijitTabChecked { - margin-bottom: 0px; - margin-top: 0px !important; +/* checked tabs */ +.soria .dijitTabContainerBottom-tabs .dijitTabChecked { + border-top-color:#94b4e6; } -.soria .dijitAlignBottom .dijitTabInnerDiv .dijitTabContent { - padding:6px 10px 6px 10px; + +.soria .dijitTabContainerBottom-tabs .dijitTabInnerDiv .dijitTabContent { + padding-top: 4px; + padding-bottom: 5px; background: url("../images/tabBottomEnabledC.gif") repeat-x bottom left; } -.soria .dijitAlignBottom .dijitTabInnerDiv { - padding:0px 10px 0px 10px; +.soria .dijitTabContainerBottom-tabs .dijitTabInnerDiv { background: url("../images/tabBottomEnabledSpriteLR.gif") no-repeat bottom right; - border: none; } -.soria .dijitAlignBottom .dijitTabHover, -.soria .dijitAlignBottom .dijitTabCloseButtonHover { +.soria .dijitTabContainerBottom-tabs .dijitTabHover, +.soria .dijitTabContainerBottom-tabs .dijitTabCloseButtonHover { color: #243C5F; background: url("../images/tabBottomHoverSpriteLR.gif") no-repeat bottom left; } -.soria .dijitAlignBottom .dijitTabHover .dijitTabInnerDiv, -.soria .dijitAlignBottom .dijitTabCloseButtonHover .dijitTabInnerDiv { +.soria .dijitTabContainerBottom-tabs .dijitTabHover .dijitTabInnerDiv, +.soria .dijitTabContainerBottom-tabs .dijitTabCloseButtonHover .dijitTabInnerDiv { background: url("../images/tabBottomHoverSpriteLR.gif") no-repeat bottom right; - border: none; } -.soria .dijitAlignBottom .dijitTabHover .dijitTabInnerDiv .dijitTabContent, -.soria .dijitAlignBottom .dijitTabCloseButtonHover .dijitTabInnerDiv .dijitTabContent { +.soria .dijitTabContainerBottom-tabs .dijitTabHover .dijitTabInnerDiv .dijitTabContent, +.soria .dijitTabContainerBottom-tabs .dijitTabCloseButtonHover .dijitTabInnerDiv .dijitTabContent { background: url("../images/tabBottomHoverC.gif") repeat-x bottom left; - padding:6px 10px 6px 10px; } -.dj_ie6 .soria .dijitAlignBottom .dijitTabHover, -.dj_ie6 .soria .dijitAlignBottom .dijitTabCloseButtonHover { - background-image: url("../images/tabHover.gif"); -} - -.soria .dijitAlignBottom .dijitTabChecked, -.soria .dijitAlignBottom .dijitTabCloseButtonChecked +.soria .dijitTabContainerBottom-tabs .dijitTabChecked, +.soria .dijitTabContainerBottom-tabs .dijitTabCloseButtonChecked { /* the selected tab (with or without hover) */ background: url("../images/tabBottomActiveSpriteLR.gif") no-repeat bottom left; } -.soria .dijitAlignBottom .dijitTabChecked .dijitTabInnerDiv { - padding:0px 10px 0px 10px; +.soria .dijitTabContainerBottom-tabs .dijitTabChecked .dijitTabInnerDiv { background: url("../images/tabBottomActiveSpriteLR.gif") no-repeat bottom right; - border: none; } -.soria .dijitAlignBottom .dijitTabChecked .dijitTabInnerDiv .dijitTabContent { +.soria .dijitTabContainerBottom-tabs .dijitTabChecked .dijitTabInnerDiv .dijitTabContent { background: url("../images/tabBottomActiveC.gif") repeat-x bottom left; - padding:7px 10px 6px 10px; } -/* left specific classes */ -.soria .dijitAlignLeft .dijitTab { - margin-right: 1px !important; +/* strip */ +.soria .dijitTabContainerBottomStrip { + padding-bottom: 2px; + padding-left: 3px; + border: 1px solid #B1BADF; } -.soria .dijitAlignLeft .dijitTabChecked { - margin-right: 0px !important; +.soria .dijitTabContainerBottomStrip { + background: #F0F4FC; } -.soria .dijitAlignLeft .dijitTabChecked .dijitTabInnerDiv { - background: url("../images/tabLeftChecked.gif") no-repeat right top !important; - padding-left: 10px; - border-bottom: 1px solid #8ba0bd !important; +/* top/bottom strip */ +.soria .dijitTabContainerBottom-spacer, +.soria .dijitTabContainerTop-spacer { + height: 2px; + border: 1px solid #8ba0bd; + background: #94b4e6; } -.soria .dijitAlignLeft .dijitTabInnerDiv { - background: url("../images/tabContainerSprite.gif") no-repeat right -350px; - padding-left: 10px; - border-bottom: 1px solid #b9bbdd; -} -.soria .dijitAlignLeft .dijitTabHover .dijitTabInnerDiv { - background: url("../images/tabContainerSprite.gif") no-repeat right -200px; - padding-left: 10px; - border-bottom: 1px solid #b9bbdd; + +/* ================================ */ +/* right tabs */ +.soria .dijitTabContainerRight-tabs { + margin-left: -1px; + border-color: #ccc; + padding-top: 3px; } -.soria .dijitTabLabels-left-h { - padding-left: 2px; - padding-top: 3px; - background-color: #f0f4fc; - border-left: 1px solid #b1badf; - border-bottom: 1px solid #b1badf; - border-top: 1px solid #b1badf; - background: #F0F4FC url("../images/tabStripeLeft.gif") repeat-y right top; - padding-right: 3px; +/* right container */ +.soria .dijitTabContainerRight-container { + border-right: none; } -.soria .dijitAlignLeft .dijitTabInnerDiv .dijitTabContent { - padding:7px 10px 6px 10px !important; +.soria .dijitTabContainerRight-tabs .dijitTab { + border-bottom: none; + border-left: 1px solid #B1BADF; + border-bottom: 1px solid #B1BADF !important; } -/* right specific classes */ -.soria .dijitTabLabels-right-h { - padding-right: 2px; - padding-top: 3px; - background-color: #f0f4fc; - border-right: 1px solid #b1badf; - border-bottom: 1px solid #b1badf; - border-top: 1px solid #b1badf; - background: #F0F4FC url("../images/tabStripeRight.gif") repeat-y left top; - padding-left: 3px; + +/* some odd ie bug when borders dissapear when setting a bottom margin, this sortof helps */ +.dj_ie .soria .dijitTabContainerRight-tabs .dijitTabInnerDiv { + border-bottom: solid #fff 1px; } -.soria .dijitAlignRight .dijitTab { - margin-left: 1px; +/* checked tabs */ +.soria .dijitTabContainerRight-tabs .dijitTabChecked { + border-left-color: #94b4e6; } -.soria .dijitAlignRight .dijitTabChecked { - margin-left: 0px; -} - -.soria .dijitAlignRight .dijitTabChecked { +.soria .dijitTabContainerRight-tabs .dijitTabChecked { background: url("../images/tabRightChecked.gif") no-repeat left top !important; } -.soria .dijitAlignRight .dijitTab { +/* some odd ie bug when borders dissapear when setting a bottom margin, this sortof helps */ +.dj_ie .soria .dijitTabContainerRight-tabs .dijitTabChecked .dijitTabInnerDiv, +.dj_ie .soria .dijitTabContainerRight-tabs .dijitTabCheckedHover .dijitTabInnerDiv { + border-bottom: solid #efefef 1px; +} + +.soria .dijitTabContainerRight-tabs .dijitTab { background: url("../images/tabContainerSprite.gif") no-repeat left -350px; } -.soria .dijitAlignRight .dijitTabHover .dijitTab { +.soria .dijitTabContainerRight-tabs .dijitTabHover .dijitTab { background: url("../images/tabContainerSprite.gif") no-repeat left -200px; } -.soria .dijitAlignRight .dijitTabInnerDiv .dijitTabContent { - padding:7px 10px 6px 10px !important; + +/* strip */ +.soria .dijitTabContainerRightStrip { + padding-right: 2px; + padding-top: 3px; + border: 1px solid #B1BADF; } -.soria .dijitAlignRight .dijitTabChecked .dijitTabInnerDiv { - border-bottom: 1px solid #8ba0bd !important; +.soria .dijitTabContainerRightStrip { + background: #F0F4FC; } -.soria .dijitAlignRight .dijitTabInnerDiv { - border-bottom: 1px solid #b9bbdd; -} -.soria .dijitAlignRight .dijitTabHover .dijitTabInnerDiv { - border-bottom: 1px solid #b9bbdd; +/* ================================ */ +/* left tabs */ +.soria .dijitTabContainerLeft-tabs { + margin-right: -1px; + border-color: #ccc; + padding-top: 3px; } -/* make space for a positioned close button */ -.soria .dijitTab .dijitClosable { - position: relative; - padding-left: 10px !important; - padding-right: 20px !important; +/* left conatiner */ +.soria .dijitTabContainerLeft-container { + border-left: none; } -.soria .dijitTab img { - padding: 0; - margin: 0; +.soria .dijitTabContainerLeft-tabs .dijitTab { + border-right: 1px solid #B1BADF; + border-bottom: 1px solid #B1BADF; } -.soria .dijitTab .dijitClosable .closeImage { - position:absolute; - top: 5px; - right: 5px; - height: 15px; - width: 15px; - padding: 0; - margin: 0; - background: url("../images/spriteRoundedIconsSmallBl.png") no-repeat -60px top; -} -.dj_ie6 .dijitTab .dijitClosable .closeImage { - background:url("../images/spriteRoundedIconsSmallBl.gif") no-repeat -60px top; -} -.dj_ie6 .soria .dijitTabCloseButton .dijitClosable .closeImage { - background: url("../images/spriteRoundedIconsSmallBl.gif") no-repeat -60px top; +/* checked tabs */ +.soria .dijitTabContainerLeft-tabs .dijitTabChecked { + border-right: 1px solid #94b4e6; } -.soria .dijitTabHover .dijitClosable .closeImage { - background: url("../images/spriteRoundedIconsSmallBl.png") no-repeat -60px -15px !important; +.soria .dijitTabContainerLeft-tabs .dijitTabInnerDiv { + background: url("../images/tabContainerSprite.gif") no-repeat right -350px; } -.dj_ie6 .soria .dijitTabHover .dijitClosable .closeImage { - background: url("../images/spriteRoundedIconsSmallBl.gif") no-repeat -60px -15px !important; +.soria .dijitTabContainerLeft-tabs .dijitTabHover .dijitTabInnerDiv { + background: url("../images/tabContainerSprite.gif") no-repeat right -200px; +} +.soria .dijitTabContainerLeft-tabs .dijitTabChecked .dijitTabInnerDiv, +.soria .dijitTabContainerLeft-tabs .dijitTabCheckedHover .dijitTabInnerDiv { + background: url("../images/tabLeftChecked.gif") no-repeat right top; } -/* correct for IE6. - We cant force hasLayout as that blows out the shrink wrapped tabs - ..so we shim in the closeImage position properties instead -*/ -.dj_ie6 .soria .dijitAlignLeft .dijitTab .dijitClosable .closeImage { - left:-20px; +.dj_ie .soria .dijitTabContainerLeft-tabs .dijitTabChecked .dijitTabInnerDiv, +.dj_ie .soria .dijitTabContainerLeft-tabs .dijitTabCheckedHover .dijitTabInnerDiv { + border-bottom: solid #efefef 1px; } -.soria .dijitAlignBottom .dijitTab .dijitClosable .closeImage { - top: auto; - bottom: 7px; - right: 3px; +.dj_ie .soria .dijitTabContainerLeft-tabs .dijitTabInnerDiv { + border-bottom: solid #fff 1px; } -.soria .dijitAlignLeft .dijitTab .dijitClosable .closeImage { - top: 7px; - left: 3px; +/* strip */ +.soria .dijitTabContainerLeftStrip { + padding-left: 2px; + padding-top: 3px; + border: 1px solid #B1BADF; +} + +.soria .dijitTabContainerLeftStrip { + background: #F0F4FC; +} + +/* ================================ */ +/* left/right tabs */ +.soria .dijitTabContainerLeft-tabs .dijitTab, +.soria .dijitTabContainerRight-tabs .dijitTab { + margin-right:auto; + margin-bottom:2px; /* space between one tab and the next in left/right mode */ +} + +/* left/right tabstrip */ +.soria .dijitTabContainerLeft-spacer, +.soria .dijitTabContainerRight-spacer { + width: 2px; + border: 1px solid #8ba0bd; + background: #94b4e6; +} + + +/* ================================ */ + +/* this resets the tabcontainer stripe when within a contentpane */ +.soria .dijitTabContainerTop-dijitContentPane .dijitTabContainerTop-tabs { + border-left: 0px solid #ccc; + border-top: 0px solid #ccc; + border-right: 0px solid #ccc; + padding-top: 0px; + padding-left: 0px; } diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/layout/TabContainer_rtl.css b/spring-js/src/main/resources/META-INF/dijit/themes/soria/layout/TabContainer_rtl.css index bf6587e5..417adfb0 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/soria/layout/TabContainer_rtl.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/soria/layout/TabContainer_rtl.css @@ -1,69 +1,47 @@ -/* TabContainer */ - -.dijitRtl .dijitTab { +.dijitRtl .soria .dijitTab { margin-right:0; - margin-left:3px; /* space between one tab and the next in top/bottom mode */ + margin-left:2px; /* space between one tab and the next in top/bottom mode */ } -.dijitRtl .dijitTab .dijitTabInnerDiv { - border-left:none; +/* tab strips */ +.dijitRtl .soria .dijitTabContainerTopStrip, +.dijitRtl .soria .dijitTabContainerBottomStrip { + padding-right: 3px; + padding-left: 0px; } -.dijitRtl .dijitTab .dijitClosable { - padding: 0 10px 0 20px; +.dijitRtl .soria .dijitTabContainerTop-tabs { + padding-left: auto; + padding-right: 3px; } -.dijitRtl .dijitTab .closeImage { - position:static; +.dijitRtl .soria .dijitTabContainerBottom-tabs { + padding-left: auto; + padding-right: 3px; } -.dj_gecko .dijitTab .closeImage { - position:relative; - float:none; - padding:0; +.dijitRtl .soria .dijitTabInnerDiv { + padding-left: 3px; + padding-right: 4px; } -.dijitRtl .dijitTab .dijitClosable .closeImage { - right:auto; - left:3px; - background-position: -60px top; +.dijitRtl .soria .dijitTabPaneWrapper { + #zoom: 1; } -.dj_ie .dijitRtl .dijitTab .dijitClosable .closeImage { - width:12px !important; +.dj_ie-rtl .soria .dijitTabContainerLeft-tabs { + margin-left: 0px !important; } -.dijitRtl .dijitAlignLeft .dijitTab, -.dijitRtl .dijitAlignRight .dijitTab { +.dj_ie-rtl .soria .dijitTabContainerRight-tabs { + margin-right: 0px !important; +} + +.dijitRtl .soria .dijitTabContainerLeft-tabs .dijitTab, +.dijitRtl .soria .dijitTabContainerRight-tabs .dijitTab { margin-left:0px; } -.dijitRtl .dijitAlignBottom .dijitTab { - margin-right:0; - margin-left:3px; /* space between one tab and the next in top/bottom mode */ -} - -.dijitRtl .dijitAlignBottom .dijitTab .dijitClosable .closeImage { - right:auto; - left:3px; -} - -.dijitRtl .dijitAlignRight .dijitTab .dijitTabInnerDiv { - padding-left:10px; - padding-right:20px; -} - -.dijitRtl .dijitAlignLeft .dijitTab .dijitTabInnerDiv { - padding-left:20px; - padding-right:10px; -} - -.dijitRtl .dijitAlignRight .dijitTab .dijitClosable .closeImage { - left:auto; - right:3px; -} - -.dijitRtl .dijitAlignLeft .dijitTab .dijitClosable .closeImage { - right:auto; - left:3px; +.dj_ie .soria .dijitTab .dijitTabInnerDiv{ + width : 1%; } \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/soria.css b/spring-js/src/main/resources/META-INF/dijit/themes/soria/soria.css index 1cd89685..47ed3516 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/soria/soria.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/soria/soria.css @@ -1,1151 +1,40 @@ /* - Soria theme - not in solid state right now. Not ready for production ... -` please feel free to add styles for new widgets should they appear, - or fix classnames you would fix in tundra.css if you change a widget - template classname. + Adds cosmetic styling to Dijit. Users may swap with a custom theme CSS file. + + NOTES: + --- + Dialog.css contains css classes for both Dialog and Tooltip! + This because currently a dijit.TooltipDialog exist. Until this is resolved + you need to include Dialog.css for both dijits + --- + Toolbar.css contains classes also used in Editor. Until this is resolved + you need to include Toolbar.css for both Toolbar and Editor + --- + Button.css contains classes for combobox, + */ @import url("../dijit.css"); - -/* un-comment to endable webkit and ff2 builtin love */ -/* -@import url("rounded.css"); -*/ - -.dj_safari .soria .dijitPopup { - -webkit-box-shadow: 0px 3px 7px #adadad; -} - -/* try and group similar look and feel into these main groupings, and put extra stling grouped - by widget somehwere below (most already have sections) */ -.soria .dijitButtonNode, -.soria .dijitToolbar, -.soria .dijitTab, -.soria .dijitSplitContainerSizerV, -.soria .dijitAccordionPane .dijitAccordionTitle, -.soria .dijitCalendarMonthContainer th, -.soria .dijitProgressBarEmpty, -.soria .dijitTooltipContainer, -.soria .dijitHorizontalSliderRemainingBar { - background:#b7cdee url('images/gradientTopBg.png') repeat-x; - /* background:#090 url('images/gradientTopBg.png') repeat-x; */ - #background-image:none !important; -} - -.soria .dijitButtonHover .dijitButtonNode, -.soria .dijitToggleButtonHover .dijitButtonNode, -.soria .dijitDropDownButtonHover .dijitButtonNode, -.soria .dijitComboButtonHover .dijitButtonContents, -.soria .dijitComboButtonDownArrowHover .dijitDownArrowButton, -.soria .dijitComboBoxHover .dijitDownArrowButton, -.soria .dijitSpinnerUpArrowHover .dijitUpArrowButton, -.soria .dijitSpinnerDownArrowHover .dijitDownArrowButton, -.soria .dijitTitlePane .dijitTitlePaneTitle, -.soria .dijitTabHover, -.soria .dijitTabCloseButtonHover, -.soria .dijitDialogTitleBar, -.soria .dijitAccordionPane-selected .dijitAccordionTitle, -.soria .dijitProgressBarTile, -.soria .dijitHorizontalSliderProgressBar { - background:#4f8ce5 url('images/gradientTopBg.png') repeat-x; - -} - -/* all icons are here */ -.soria .dijitComboBox .dijitDownArrowButtonInner, -.soria .dijitMenuExpandEnabled, -.soria .dijitTitlePane .dijitClosed .dijitArrowNode, -.soria .dijitTitlePane .dijitOpen .dijitArrowNode, -.soria .dijitTab .dijitClosable .closeImage, -.soria .dijitTabCloseButton .dijitClosable .closeImage, -.soria .dijitTabCloseButtonHover .dijitClosable .closeImage, -.soria .dijitSplitContainerSizerH .thumb, -.soria .dijitSplitContainerSizerV .thumb, -.soria .dijitDialogCloseIcon, -.soria .dijitTooltipConnector, -.soria .dijitAccordionArrow, -.soria .dijitCalendarDecrease, -.soria .dijitCalendarIncrease, -.soria .dijitHorizontalSliderDecrementIcon, -.soria .dijitHorizontalSliderIncrementIcon, -.soria .dijitVerticalSliderIncrementIcon, -.soria .dijitVerticalSliderDecrementIcon, -.soria .dijitHorizontalSliderImageHandle, -.soria .dijitVerticalSliderImageHandle, -.soria .dijitInputFieldValidationIconNormal, -.soria .dijitInputFieldValidationIcon, -/* FIXME: need to make these spans inside the cell? */ -.soria.dojoDndMove .dojoDndAvatarCanDrop .dojoDndAvatarHeader, -.soria.dojoDndCopy .dojoDndAvatarCanDrop .dojoDndAvatarHeader, -.soria.dojoDndCopy .dojoDndAvatarHeader, -.soria.dojoDndMove .dojoDndAvatarHeader, -/* FIXME: should be .dijitRtl .soria ... {} */ -.dijitRtl .dijitCalendarDecrease, -.dijitRtl .dijitCalendarIncrease, -.dijitRtl .dijitMenuItem .dijitMenuExpandEnabled, -.dijitRtl .dijitTitlePane .dijitClosed .dijitArrowNode, -.dijitRtl .dijitDialogTitleBar .dijitDialogCloseIcon -{ - width:16px; - height:16px; - overflow:hidden; - margin:0; padding:0; - background-image: url('images/arrows.png'); - background-repeat: none; -} - -.soria .dijitCheckBoxIcon, -.soria .dijitRadioIcon, -.soria .dijitCheckBox, -.soria .dijitRadio { - width:16px; - height:16px; - margin:0; padding:0; - background-image: url('images/arrows.png'); -} - -/* Control opacity of popups */ -.soria .dijitPopup div, -.soria .dijitPopup table { - opacity: 0.95; -} -/* - dijit.form.Button - dijit.form.DropDownButton - dijit.form.ComboButton - dijit.form.ComboBox (partial) -*/ -.soria .dijitButtonNode { - /* enabled state - inner */ - border:1px solid #4f8ce5; - vertical-align: middle; - padding: 0.2em 0.2em; -} - -.dj_ie6 .soria .dijitButtonNode { - zoom: 1; - padding-bottom: 0.1em; -} - -.soria .dijitButtonDisabled .dijitButtonNode, -.soria .dijitToggleButtonDisabled .dijitButtonNode, -.soria .dijitDropDownButtonDisabled .dijitButtonNode, -.soria .dijitComboButtonDisabled .dijitButtonNode, -.soria .dijitComboBoxDisabled .dijitDownArrowButton, -.soria .dijitComboBoxDisabled .dijitInputField, -.soria .dijitSpinnerDisabled .dijitInputField, -.soria .dijitSpinnerDisabled .dijitButtonNode { - /* disabled state - inner */ - border: 1px solid #d5d5d5; - background:#ccc url("images/gradientTopBg.png") repeat-x top left; - opacity: 0.50; /* Safari, Opera and Mozilla */ -} -.soria .dijitButtonDisabled .dijitButtonNode *, -.soria .dijitToggleButtonDisabled .dijitButtonNode *, -.soria .dijitDropDownButtonDisabled .dijitButtonNode *, -.soria .dijitComboButtonDisabled .dijitButtonNode *, -.soria .dijitSpinnerDisabled .dijitButtonNode * { - filter: gray() alpha(opacity=50); /* IE */ -} - -.soria .dijitButtonHover .dijitButtonNode, -.soria .dijitToggleButtonHover .dijitButtonNode, -.soria .dijitDropDownButtonHover .dijitButtonNode, -.soria .dijitComboButtonHover .dijitButtonContents, -.soria .dijitComboButtonDownArrowHover .dijitDownArrowButton, -.soria .dijitComboBoxHover .dijitDownArrowButton, -.soria .dijitSpinnerUpArrowHover .dijitUpArrowButton, -.soria .dijitSpinnerDownArrowHover .dijitDownArrowButton { - /* hover state - inner */ - border-color:#666; - color:#fff; - background-position:0px -1px; -} - -.soria .dijitButtonActive .dijitButtonNode, -.soria .dijitToggleButtonActive .dijitButtonNode, -.soria .dijitDropDownButtonActive .dijitButtonNode, -.soria .dijitComboButtonActive .dijitButtonContents, -.soria .dijitDownArrowActive .dijitDownArrowButton, -.soria .dijitComboBoxActive .dijitDownArrowButton { - /* active state - inner (for when you are pressing a normal button, or - * when a toggle button is in a depressed state - */ - border-color:#333; - background: #cbdcf7 url("images/gradientBottomBg.png") bottom repeat-x; -} - -/* button inner contents - labels, icons etc. */ -.soria .dijitButtonNode * { - display: -moz-inline-box; - display: inline-block; - vertical-align: middle; -} -.dj_ie .soria .dijitButtonNode * { - zoom: 1; - display:inline; -} -.soria .dijitButtonText { - padding: 0 0.3em; -} - - -.soria .dijitToolbar { - border: 1px solid #333; -} -.soria .dijitToolbar * { - padding: 0px; - margin: 0px; -} -.dj_ie .soria .dijitToolbar { - padding-bottom: 1px; - margin-top: -1px; -} -.soria .dijitToolbar .dijitButtonNode { - padding: 0px; - margin: 0px; - border: 1px solid transparent; - background: none; -} -.soria .dijitToolbar .dijitToggleButtonChecked .dijitButtonNode { - background-color:#C1D2EE; - border:1px solid #666; - border-top:0; - border-bottom:0; -} -.soria .dijitToolbar .dijitToggleButtonCheckedHover .dijitButtonContents { - border-color: #000; - background-color:transparent; -} -.dj_ie6 .soria .dijitToolbar .dijitButtonNode { - /* workaround no transparent border support in IE6*/ - border-color: #e9e9e9; -} -.soria .dijitToolbar .dijitButtonHover .dijitButtonNode, -.soria .dijitToolbar .dijitToggleButtonHover .dijitButtonNode, -.soria .dijitToolbar .dijitDropDownButtonHover .dijitButtonNode { - border-color: #366dba; -} -.dijitToolbarSeparator { - background: url('images/editor.gif'); - height: 18px; - width: 5px; - padding: 0px 1px 0px 1px; - margin: 0px; -} -.soria .dijitToolbar .dijitToolbarSeparator { - background: url('images/editor.gif'); -} - -/* ComboBox-icon-specific */ -.soria .dijitComboBox .dijitDownArrowButtonChar { - /* visibility:hidden; */ - display:none; -} -.soria .dijitComboBox .dijitDownArrowButtonInner { background-position:0px 0px; } -.soria .dijitComboBoxHover .dijitDownArrowButtonInner { } -.soria .dijitSpinner .dijitButtonNode { - padding: 0 .4em 0 .4em; -} - -/* - dijit.form.TextBox - dijit.form.ValidationTextBox - dijit.form.SerializableTextBox - dijit.form.RangeBoundTextBox - dijit.form.NumberTextBox - dijit.form.CurrencyTextBox - dijit.form.NumberSpinner - dijit.form.ComboBox (partial) -*/ -.soria .dijitComboBox { - /* put margin on the outer element of the autocompleter rather than the input */ - margin:.0em .1em .2em .1em; -} - -.soria .dijitInputField, -.soria .dijitInlineEditor input, -.soria .dijitTextArea { - /* For all except dijit.form.NumberSpinner: the actual input element. - For dijit.form.NumberSpinner: the outer fieldset that contains the input. - */ - font-size: inherit; - background:#fff url("images/gradientInverseTopBg.png") repeat-x top left; - background-position:0 -32px; - /* border:1px solid #333; */ - line-height: normal; - padding: 0.2em 0.3em; -} - -.dj_ie .soria TD.dijitInputField, -.dj_ie .soria .dijitInputField INPUT { - height: 1.65em; /* set height for IE since the INPUT is position:absolute */ -} - -.dj_safari .soria .dijitInputField { - padding: 0.08em 0.3em; /* looks better */ -} - -.soria INPUT.dijitTextBox { - padding: 0.2em 0.3em; -} - -.dj_ie .soria .dijitTextBox INPUT, -.dj_ie .soria .dijitComboBox INPUT, -.dj_ie .soria .dijitSpinner INPUT { - width:95% !important; /* add a little padding-right for position:absolute INPUT */ -} - -.soria .dijitComboBoxFocused .dijitInputField { - /* input field when focused (eg: typing affects it) */ - border-color:#333; - border-style:inset; -} - -.soria .dijitComboBoxDisabled .dijitInputField { - /* input field when disabled (also set above) */ -} - -.soria .dijitComboBoxHover .dijitInputField { - /* input field when hovered over */ - border-color:#4f8ce5; -} - -.soria .dijitComboBoxActive .dijitInputField { - /* input field when mouse is down (?) */ -} - -/* Dojo Input Field */ - -HTML.dj_ie6 .soria .dijitInputFieldValidationNormal, -.soria .dijitInputFieldValidationNormal { - -} - -HTML.dj_ie6 .soria .dijitInputFieldValidationError, -.soria .dijitInputFieldValidationError { - border:1px solid #f3d118; - background-color::#f9f7ba; - background-image:none; -} - -.soria .dijitInputFieldFocused { - border:1px solid #000; -} - -.soria .dijitInputFieldValidationError:hover, -.soria .dijitInputFieldValidationError:focus { - background-color:#ff6; - background-image:none; -} -.soria .dijitInputFieldValidationIcon { - margin-left: 3px; - padding-bottom: 1px; -} -.soria .dijitInputFieldValidationIconNormal { - background-image: none; -} - -.soria .dijitInputFieldValidationIconError { - background-position:-384px 0px; -} - -.soria .dijitInputFieldValidationIconText { - visibility: hidden; -} - -/* CheckBox and Radio Widgets, and the CSS to embed a checkbox or radio icon inside a ToggleButton. */ - -.soria .dijitToggleButton .dijitCheckBox, -.soria .dijitToggleButton .dijitRadio, -.soria .dijitToggleButton .dijitCheckBoxIcon, -.soria .dijitToggleButton .dijitRadioIcon { - background-image: url('images/checkmarkNoBorder.gif'); -} - -.soria .dijitCheckBox, .soria .dijitToggleButton .dijitCheckBoxIcon { background-position: -112px; }/* unchecked */ -.soria .dijitCheckBoxChecked, -.soria .dijitToggleButtonChecked .dijitCheckBoxIcon { background-position: -96px; } /* checked */ -.soria .dijitCheckBoxDisabled { /* disabled */ background-position: -144px; } -.soria .dijitCheckBoxCheckedDisabled { background-position: -128px; } /* disabled but checked */ -.soria .dijitCheckBoxHover, -.soria .dijitCheckBoxFocused { background-position: -176px; } /* hovering over an unchecked enabled checkbox */ -.soria .dijitCheckBoxCheckedHover, -.soria .dijitCheckBoxCheckedFocused { background-position: -160px; } /* hovering over a checked enabled checkbox */ -.soria .dijitRadio, -.soria .dijitToggleButton .dijitRadioIcon { background-position: -208px; } /* unselected */ -.soria .dijitRadioChecked, -.soria .dijitToggleButtonChecked .dijitRadioIcon { background-position: -192px; } /* selected */ -.soria .dijitRadioCheckedDisabled { background-position: -224px; } /* selected but disabled */ -.soria .dijitRadioDisabled { background-position: -240px; } /* unselected and disabled */ -.soria .dijitRadioHover, -.soria .dijitRadioFocused { background-position: -272px; } /* hovering over an unselected enabled radio button */ -.soria .dijitRadioCheckedHover, -.soria .dijitRadioCheckedFocused { background-position: -256px; } /* hovering over a selected enabled radio button */ - -/* diji.Menu */ -.soria .dijitMenu { - border: 1px solid #333; - margin: 0px; - padding: 0px; -} -.soria .dijitMenuSeparator, -.soria .dijitMenuItem { - background-color: #b7cdee; - font: menu; - margin: 0; -} -.soria .dijitMenuItem TD { - padding:2px; - outline:0; -} -.soria .dijitMenuItemHover { - background-color: #4f8ce5; - color:#fff; -} -.soria .dijitMenuExpand { - display:none; -} -.soria .dijitMenuExpandEnabled { - background-position: -48px 0px; - display:block; -} -.soria .dijitMenuExpandInner { - display:none !important; -} -/* separator can be two pixels -- set border of either one to 0px to have only one */ -.soria .dijitMenuSeparatorTop { - border-bottom: 1px solid #333; -} - -.soria .dijitMenuSeparatorBottom { - border-top: 1px solid #666; -} - -/* TitlePane */ -.soria .dijitTitlePane .dijitTitlePaneTitle { - border:1px solid #333; - border-bottom:0; - background-position:0px -1px; - padding:4px 4px 4px 4px; - cursor: pointer; - color:#fff; - font-weight:bold; -} -.soria .dijitTitlePane .dijitClosed { - border-bottom:1px solid #333; -} -.soria .dijitTitlePane .dijitClosed .dijitArrowNode { background-position:-48px 0px; } -.soria .dijitTitlePane .dijitOpen .dijitArrowNode { background-position:0px 0px; } -.soria .dijitTitlePane .dijitArrowNodeInner { visibility:hidden; } -.soria .dijitTitlePaneTitle .dijitOpenCloseArrowOuter { margin-right:5px; } -.soria .dijitOpen .dijitTitlePaneTitle .dijitOpenCloseArrowOuter { - position:relative; - top:2px; -} -.soria .dijitTitlePaneContentOuter { - background: #ffffff; - border:1px solid #666; - border-top: 1px solid #666; /* w/out this, an

on the top line causes a gap between the .content and .label */ -} -.soria .dijitTitlePaneContentInner { - padding:10px; -} -/* force hasLayout to ensure borders etc, show up */ -.dj_ie6 .soria .dijitTitlePaneContentOuter, -.dj_ie6 .soria .dijitTitlePane .dijitTitlePaneTitle { - zoom: 1; -} -.soria .dijitClickableRegion { - background-color : #ffc !important; -} - -/* Tabs */ -.soria .dijitTabPaneWrapper { - background:#fff; - /* border:1px solid #b7cde5; */ - border:1px solid #666; -} - -.soria .dijitTab { - line-height:normal; - margin-right:3px; /* space between one tab and the next in top/bottom mode */ - padding:0px; - border:1px solid #666; -} - -.soria .dijitAlignLeft .dijitTab, -.soria .dijitAlignRight .dijitTab { - margin-right:0px; - margin-bottom:5px; /* space between one tab and the next in left/right mode */ -} - -.soria .dijitTabInnerDiv { - padding:6px 10px 4px 10px; - /* border-left:1px solid #fff; */ - border-bottom:transparent; -} -.dj_ie6 .soria .dijitTabInnerDiv { border-bottom:0; } - -.soria .dijitTabInnerDiv span { - outline:0; -} - -.soria .dijitTabHover, -.soria .dijitTabCloseButtonHover { - color: #fff; - border-top-color:#333; - border-left-color:#333; - border-right-color:#333; -} - -.soria .dijitTabChecked, -.soria .dijitTabCloseButtonChecked -{ - /* the selected tab (with or without hover) */ - background-color:#fff; - border-color:#666; - border-top:1px solid #666; - color:#333; - -/* border-color: #4F8CE5; */ -/* border-top:1px solid #4f8ce5; */ - background-image:none; -} -.soria .dijitTabCloseButton { - border-bottom:1px solid #fff; -} - -/* make the active tab white on the side next to the content pane */ -.soria .dijitAlignTop .dijitTabChecked, -.soria .dijitAlignTop .dijitTabCloseButtonChecked -{ - border-bottom-color:white; - vertical-align:bottom; -} - -.soria .dijitAlignBottom .dijitTabChecked, -.soria .dijitAlignBottom .dijitTabCloseButtonChecked -{ - border-top-color:transparent; - -moz-border-radius:2px 2px 0px 0px; /* eliminate some border detritrus on moz */ -} - -.soria .dijitAlignLeft .dijitTabChecked, -.soria .dijitAlignLeft .dijitTabCloseButtonChecked -{ - border-right-color:white; -} - -.soria .dijitAlignRight .dijitTabChecked, -.soria .dijitAlignRight .dijitTabCloseButtonChecked -{ - border-left-color:white; -} - -/* make space for a positioned close button */ -.soria .dijitTab .dijitClosable { - position: relative; - padding:6px 24px 3px 10px; - /* border-bottom:transparent; */ -} - -.soria .dijitTab .dijitClosable .closeImage { - position:absolute; - top: 5px; - right: 3px; - background-position:-65px -1px; -} - -.soria .dijitTabCloseButton .dijitClosable .closeImage { background-position:-65px -1px; } -.soria .dijitTabCloseButtonHover .dijitClosable .closeImage { background-position:-81px -1px; } - -.soria .dijitAlignLeft .dijitTab .dijitClosable { - padding:6px 10px 6px 20px; -} -/* correct for IE6. - We cant force hasLayout as that blows out the shrink wrapped tabs - ..so we shim in the closeImage position properties instead -*/ -.dj_ie6 .soria .dijitAlignLeft .dijitTab .dijitClosable .closeImage { - left:-20px; -} - -.soria .dijitAlignBottom .dijitTab .dijitClosable .closeImage { - top: auto; - bottom: 5px; - right: 2px; -} - -.soria .dijitAlignLeft .dijitTab .dijitClosable .closeImage { - top: 2px; - left: 5px; -} - -/* SplitContainer */ - -.soria .dijitSplitContainerSizerH { - background:#b7cdee url("images/gradientLeftBg.png") repeat-y; - border:0; - border-right:1px solid #cbdcf7; - width:7px; -} - -.soria .dijitSplitContainerSizerH .thumb { - background-position:-357px 0px; - left:0px; - width:6px; -} - -.soria .dijitSplitContainerSizerV { - border:0; - border-bottom:1px solid #cbdcf7; - height:7px; -} - -.soria .dijitSplitContainerSizerV .thumb { - background-position:-368px -5px; - top:0px; - height:6px; -} - -/* Dialog */ -.soria .dijitDialog { - margin:0; padding:0; - background: #eee; - border: 1px solid #666; - border-top:0px; - -webkit-box-shadow: 0px 3px 7px #adadad; -} - -.soria .dijitDialog .dijitDialogTitle { - border-top: none; - border-left: none; - border-right: none; -} - -.soria .dijitDialog .dijitDialogPaneContent { - background: #ffffff; - border:none; - padding:10px; - outline:0; - opacity:1; -} - -.soria .dijitDialogTitleBar { - /* outer container for the titlebar of the dialog */ - border-top: 1px solid #666; - border-bottom: 1px solid #666; - padding: 4px 4px 4px 4px; - cursor: move; - outline:0; -} - -.soria .dijitDialogTitle { - /* typography and styling of the dialog title */ - font-weight: bold; - color:#fff; - padding: 8px 8px 8px 8px; - outline:0; -} - -.soria .dijitDialogCloseIcon { - /* the default close icon for the dialog */ - background-position:-64px 0px; - float: right; - position: absolute; - vertical-align: middle; - right: 5px; - top: 5px; - cursor: pointer; -} -.soria .dijitDialogContent { - /* the body of the dialog */ - padding: 8px; -} - -/* Tooltip */ -.soria .dijitTooltip, -.soria .dijitTooltipDialog { - /* the outermost dom node, holding the connector and container */ - opacity: 0.85; - background: transparent; /* make the area on the sides of the arrow transparent */ -} - -.dijitTooltipBelow { - /* leave room for arrow above content */ - padding-top: 13px; -} - -.dijitTooltipAbove { - /* leave room for arrow below content */ - padding-bottom: 13px; -} - -.soria .dijitTooltipContainer { - background-color:#ffc; - background-position:0 -30px; - border:1px solid #333; - padding:0.45em; - border-radius: 6px; - -moz-border-radius: 7px; - -webkit-border-radius: 6px; -} -.soria .dijitTooltipContents { - outline:0; /* the node that gets focus */ -} - -.soria .dijitTooltipConnector { - /* the arrow piece */ - border:0px; - z-index: 2; - width:16px; - height:14px; -} -.soria .dijitTooltipABRight .dijitTooltipConnector { - left: auto !important; - right: 3px; -} -.soria .dijitTooltipBelow .dijitTooltipConnector { - /* the arrow piece for tooltips below an element */ - top: 0px; - left: 3px; - background-position:-336px 0px; -} -.soria .dijitTooltipAbove .dijitTooltipConnector { - /* the arrow piece for tooltips above an element */ - bottom: 0px; - left: 3px; - background-position:-304px 0px; -} -.soria .dijitTooltipLeft { - padding-right: 14px; -} -.dj_ie6 .soria .dijitTooltipLeft { - padding-right: 16px; -} -.soria .dijitTooltipLeft .dijitTooltipConnector { - /* the arrow piece for tooltips to the left of an element, bottom borders aligned */ - right: 0px; - bottom: 7px; - background-position:-288px 0px; -} -.soria .dijitTooltipRight { - padding-left: 13px; -} -.soria .dijitTooltipRight .dijitTooltipConnector { - /* the arrow piece for tooltips to the right of an element, bottom borders aligned */ - left: 0px; - bottom: 7px; - background-position:-321px 0px; -} - -/* dijit.layout.AccordionPane */ -.soria .dijitAccordionPane .dijitAccordionTitle { - border:1px solid #666; - border-bottom:0; - padding:5px 5px 3px 5px; - color:#333; -} - -.soria .dijitAccordionPane-selected .dijitAccordionTitle { - color:#fff; - padding: 5px 5px 3px 5px; - font-weight: bold; -} - -.soria .dijitAccordionPane .dijitAccordionArrow { - background-position: -32px 0px; -} -.soria .dijitAccordionPane-selected .dijitAccordionArrow { - background-position: 0px 0px; -} -.soria .dijitAccordionPane .dijitAccordionBody { - background: #fff; - border:1px solid #666; - border-bottom:0; -} - -/* Tree */ -.soria .dijitTreeNode { - margin-left: 19px; - cursor:pointer; - zoom: 1; -} -.soria .dijitTreeIsRoot { - margin-left: 4px; -} -/* left vertical line (grid) for all nodes */ -.soria .dijitTreeIsLast { - background: transparent; -} -.soria .dijitTreeExpando { - width: 18px; - height: 18px; - cursor:pointer; -} -.soria .dijitTreeContent { - min-height: 18px; - min-width: 18px; - margin-left:16px; - padding-top:3px; - padding-left:1px; -} -.soria .dijitTreeExpand { - width: 18px; - height: 18px; - background-repeat : no-repeat; -} - -/* same style as IE selection */ -.soria .dijitTreeNodeEmphasized { - background-color: Highlight; - color: HighlightText; -} - -/* don't use :focus due to opera and IE's lack of support on div's */ -.soria .dijitTreeLabelFocused { - outline:0; - border-top:0; - border-bottom:2px solid #4f8ce5; - background-color:#b7cdee; -} - -/* FIXME: convert to sprites */ -.soria .dijitTreeExpandoOpened { background-image: url('images/treeExpand_minus.gif'); } -.soria .dijitTreeExpandoClosed { background-image: url('images/treeExpand_plus.gif'); } -.soria .dijitTreeExpandoLeaf { } -.soria .dijitTreeExpandoLoading { background-image: url('images/treeExpand_loading.gif'); } - -/* Calendar*/ -.dj_ie6 .soria .dijitCalendarIncrementControl { - padding:.1em; -} - -.soria .dijitCalendarIncreaseInner, -.soria .dijitCalendarDecreaseInner { display:none; } -.soria .dijitCalendarDecrease { background-position:-16px 0px; } -.soria .dijitCalendarIncrease { background-position:-48px 0px; } -.soria table.dijitCalendarContainer { - font-size: 100%; - border-collapse: collapse; - border-spacing: 0; - border: 1px solid #666; - margin: 0; -} - -.soria .dijitCalendarMonthContainer th { - /* month header cell */ - padding-top:.3em; - padding-bottom:.1em; - text-align:center; -} -.dj_ie6 .soria .dijitCalendarMonthContainer th { - padding-top:.1em; - padding-bottom:0em; -} - -.soria .dijitCalendarDayLabelTemplate { - /* day of week labels */ - background:#b7cdee url("images/gradientBottomBg.png") repeat-x bottom; - font-weight:normal; - background-position:0 -28px; - padding-top:.15em; - padding-bottom:0em; - border-top:0; - border-bottom:1px solid #666; - color:#293a4b; - text-align:center; -} - -.soria .dijitCalendarMonthLabel { - /* day of week labels */ - color:#293a4b; - font-size: 0.75em; - font-weight: bold; - text-align:center; -} - -.dj_ie7 .soria .dijitCalendarDateTemplate, -.dj_ie6 .soria .dijitCalendarDateTemplate { - font-size: 0.8em; -} - -.soria .dijitCalendarDateTemplate { - /* style for each day cell */ - font-size: 0.9em; - font-weight: bold; - text-align: center; - padding: 0.3em 0.3em 0.05em 0.3em; - letter-spacing: 1px; -} - - -.soria .dijitCalendarPreviousMonth, -.soria .dijitCalendarNextMonth { - /* days that are part of the previous or next month */ - color:#999999; - background-color:#f8f8f8 !important; -} - -.soria .dijitCalendarPreviousMonthDisabled, -.soria .dijitCalendarNextMonthDisabled { - /* days that are part of the previous or next month - disabled*/ - background-color:#a4a5a6 !important; -} - -.soria .dijitCalendarCurrentMonth { - /* days that are part of this month */ - background-color:white !important; -} - -.soria .dijitCalendarCurrentMonthDisabled { - /* days that are part of this month - disabled */ - background-color:#bbbbbc !important; -} - -.soria .dijitCalendarCurrentDate { - /* cell for today's date */ - text-decoration:underline; - font-weight:bold; -} - -.soria .dijitCalendarSelectedDate { - /* cell for the selected date */ - background-color:#4f8ce5 !important; - color:#fff !important; -} - - -.soria .dijitCalendarYearContainer { - /* footer of the table that contains the year display/selector */ - background:#b7cdee url("images/gradientBottomBg.png") repeat-x bottom; - border-top:1px solid #333; -} - -.soria .dijitCalendarYearLabel { - /* container for all of 3 year labels */ - margin:0; - padding:0.4em 0 0.25em 0; - text-align:center; -} - -.soria .dijitCalendarSelectedYear { - /* label for selected year */ - color:#fff; - padding:0.2em; - padding-bottom:0.1em; - background-color:#4f8ce5 !important; -} - -.soria .dijitCalendarNextYear, -.soria .dijitCalendarPreviousYear { - /* label for next/prev years */ - color:black !important; - font-weight:normal; -} - -/* inline edit boxen */ -.soria .dijitInlineValue { - /* span around an inline-editable value when NOT in edit mode */ - padding:3px; - margin:4px; -} - - -/* MOW: trying to get this to look like a mini-dialog. Advised? */ -.soria .dijitInlineEditor { - /* fieldset surrounding an inlineEditor in edit mode */ - display: inline-block; - display: -moz-inline-stack; -} -.dj_ie6 .dijitInLineEditor { - display:inline; -} -.dijitInlineEditor .saveButton, -.dijitInlineEditor .cancelButton { - margin:3px 3px 3px 0px; -} - -/* spinner */ -.soria .dijitSpinner {} -.soria .dijitSpinner input { -} - -/* dijit.ProgressBar */ -.soria .dijitProgressBar { - margin:2px 0px 2px 0px; -} - -.soria .dijitProgressBarEmpty { - /* outer container and background of the bar that's not finished yet*/ - border-color: #333; -} - -.soria .dijitProgressBarTile { - /* inner container for finished portion when in 'tile' (image) mode */ -} - -.soria .dijitProgressBarLabel { - /* Set to a color that contrasts with both the "Empty" and "Full" parts. */ - color:#293a4b; -} - -.soria .dijitProgressBarIndeterminate .dijitProgressBarTile { - /* use an animated gif for the progress bar in 'indeterminate' mode */ - background:#b7cdee url("images/progressBarAnim.gif") repeat-x top left; - /* FIXME: make a white/alpha animation to overlay a colored node */ -} - -/* dijit.Slider(s) */ -.soria .dijitHorizontalSliderProgressBar { - border-color: #333; - zoom:1; -} -.soria .dijitVerticalSliderProgressBar { - border-color: #333; - background: #4f8ce5 url("images/gradientLeftBg.png") repeat-y bottom left; -} -.soria .dijitVerticalSliderRemainingBar { - border-color: #333; - background: #b7cdee url("images/gradientLeftBg.png") repeat-y bottom left; -} -.soria .dijitHorizontalSliderRemainingBar { border-color: #333; } -.soria .dijitSliderBar { - border-style: solid; - outline:1px; -} - -.soria .dijitHorizontalSliderImageHandle { - border:0px; - background-position:-416px 0px; - cursor:pointer; -} -.soria .dijitHorizontalSliderLeftBumper { - border:0; - border-right:1px solid #333; - background:transparent; -} -.soria .dijitHorizontalSliderRightBumper { - border:0; - border-left:1px solid #333; - background:transparent; -} - -.soria .dijitVerticalSliderImageHandle { - border:0px; - background-position:-400px 0px; - cursor:pointer; -} - -.soria .dijitVerticalSliderBottomBumper { - border-bottom-width: 1px; - border-color: #333; - background: #4f8ce5 url("images/gradientLeftBg.png") repeat-y bottom left; -} - -.soria .dijitVerticalSliderTopBumper { - background: #b7cdee url("images/gradientLeftBg.png") repeat-y top left; - border-color: #333; - border-top-width: 1px; -} - -.soria .dijitSliderDisabled { - opacity:0.5 !important; -} -.dj_ie6 .soria .dijitSliderDisabled { - filter: gray() alpha(opacity=50); -} - -.soria .dijitHorizontalSliderIncrementIcon { background-position:-48px 0px; } -.soria .dijitHorizontalSliderDecrementIcon { background-position:-16px 0px; } -.soria .dijitVerticalSliderIncrementIcon { background-position:-32px 0px; } -.soria .dijitVerticalSliderDecrementIcon { background-position:0px 0px; } - -.soria .dijitSliderButtonInner { visibility:hidden; } -.dijit_a11y .dijitSliderButtonInner { visibility:visible !important; } - -/* ICONS */ -.soria .dijitEditorIcon { - background-image: url('images/editor.gif'); /* editor icons sprite image */ - background-repeat: no-repeat; - width: 18px; - height: 18px; - text-align: center; -} -.soria .dijitEditorIconSep { background-position: 0px; } -.soria .dijitEditorIconBackColor { background-position: -18px; } -.soria .dijitEditorIconBold { background-position: -36px; } -.soria .dijitEditorIconCancel { background-position: -54px; } -.soria .dijitEditorIconCopy { background-position: -72px; } -.soria .dijitEditorIconCreateLink { background-position: -90px; } -.soria .dijitEditorIconCut { background-position: -108px; } -.soria .dijitEditorIconDelete { background-position: -126px; } -.soria .dijitEditorIconForeColor { background-position: -144px; } -.soria .dijitEditorIconHiliteColor { background-position: -162px; } -.soria .dijitEditorIconIndent { background-position: -180px; } -.soria .dijitEditorIconInsertHorizontalRule { background-position: -198px; } -.soria .dijitEditorIconInsertImage { background-position: -216px; } -.soria .dijitEditorIconInsertOrderedList { background-position: -234px; } -.soria .dijitEditorIconInsertTable { background-position: -252px; } -.soria .dijitEditorIconInsertUnorderedList { background-position: -270px; } -.soria .dijitEditorIconItalic { background-position: -288px; } -.soria .dijitEditorIconJustifyCenter { background-position: -306px; } -.soria .dijitEditorIconJustifyFull { background-position: -324px; } -.soria .dijitEditorIconJustifyLeft { background-position: -342px; } -.soria .dijitEditorIconJustifyRight { background-position: -360px; } -.soria .dijitEditorIconLeftToRight { background-position: -378px; } -.soria .dijitEditorIconListBulletIndent { background-position: -396px; } -.soria .dijitEditorIconListBulletOutdent { background-position: -414px; } -.soria .dijitEditorIconListNumIndent { background-position: -432px; } -.soria .dijitEditorIconListNumOutdent { background-position: -450px; } -.soria .dijitEditorIconOutdent { background-position: -468px; } -.soria .dijitEditorIconPaste { background-position: -486px; } -.soria .dijitEditorIconRedo { background-position: -504px; } -.soria .dijitEditorIconRemoveFormat { background-position: -522px; } -.soria .dijitEditorIconRightToLeft { background-position: -540px; } -.soria .dijitEditorIconSave { background-position: -558px; } -.soria .dijitEditorIconSpace { background-position: -576px; } -.soria .dijitEditorIconStrikethrough { background-position: -594px; } -.soria .dijitEditorIconSubscript { background-position: -612px; } -.soria .dijitEditorIconSuperscript { background-position: -630px; } -.soria .dijitEditorIconUnderline { background-position: -648px; } -.soria .dijitEditorIconUndo { background-position: -666px; } -.soria .dijitEditorIconWikiword { background-position: -684px; } - -.dj_ie6 .soria .dijitInputField -{ - background:#fff; - /* FIXME: un-comment when a pretty version of .gif is made */ - /* background-image: url("images/dojoTundraGradientBg.gif"); */ -} - -/* Disabled cursor */ -.soria .dijitDisabledClickableRegion, /* a region the user would be able to click on, but it's disabled */ -.soria .dijitSliderDisabled *, -.soria .dijitSpinnerDisabled *, -.soria .dijitButtonDisabled *, -.soria .dijitDropDownButtonDisabled *, -.soria .dijitComboButtonDisabled *, -.soria .dijitComboBoxDisabled * -{ - cursor: not-allowed !important; -} - -/* DnD avatar-specific settings FIXME: need to wrap icon in a span like rest of dijits. */ -/* For now it uses a default set of rules. Some other DnD classes can be modified as well. */ -.soria .dojoDndAvatar { font-size: 75%; color: black; } -.soria .dojoDndAvatarHeader td { - padding-left: 20px; - padding-right: 4px; -} -.soria .dojoDndAvatarHeader { - background: #ccc; -} -.soria .dojoDndAvatarItem { background: #eee; } -.soria.dojoDndMove .dojoDndAvatarHeader { background-position:-432px 0px; } -.soria.dojoDndCopy .dojoDndAvatarHeader { background-position:-448px 0px; } -.soria.dojoDndMove .dojoDndAvatarCanDrop .dojoDndAvatarHeader { background-position:-464px 0px; } -.soria.dojoDndCopy .dojoDndAvatarCanDrop .dojoDndAvatarHeader { background-position:-480px 0px; } - - +@import url("Common.css"); + +@import url("layout/ContentPane.css"); +@import url("layout/TabContainer.css"); +@import url("layout/AccordionContainer.css"); +@import url("layout/SplitContainer.css"); +@import url("layout/BorderContainer.css"); +@import url("form/Common.css"); +@import url("form/Button.css"); +@import url("form/ComboBox.css"); +@import url("form/Checkbox.css"); +@import url("form/RadioButton.css"); +@import url("form/Slider.css"); +@import url("Tree.css"); +@import url("ProgressBar.css"); +@import url("TitlePane.css"); +@import url("Calendar.css"); +@import url("TimePicker.css"); +@import url("Toolbar.css"); +@import url("Dialog.css"); +@import url("Menu.css"); +@import url("Editor.css"); +@import url("ColorPalette.css"); \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/soria/soria_rtl.css b/spring-js/src/main/resources/META-INF/dijit/themes/soria/soria_rtl.css index eaa550d4..05bfa3fe 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/soria/soria_rtl.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/soria/soria_rtl.css @@ -1,90 +1,28 @@ +/* + Adds cosmetic styling to Dijit. Users may swap with a custom theme CSS file. + + NOTES: + --- + Dialog.css contains css classes for both Dialog and Tooltip! + This because currently a dijit.TooltipDialog exist. Until this is resolved + you need to include Dialog.css for both dijits + --- + Toolbar.css contains classes also used in Editor. Until this is resolved + you need to include Toolbar.css for both Toolbar and Editor + --- + Button.css contains classes for combobox, + +*/ + @import url("../dijit_rtl.css"); - -/* Dialog */ -.dijitRtl .dijitDialogTitleBar .dijitDialogCloseIcon { - background-position:-65px -1px; - float: left; - right: auto; - left: 5px; - width:16px; height:16px; -} - -.dijitRtl .dijitDialogTitleBar { - padding: 4px 4px 2px 8px; -} - -/* Menu */ -.dijitRtl .dijitMenuItem .dijitMenuItemIcon { - padding-left: 3px; - padding-right: 0px; -} - -.dijitRtl .dijitMenuItem .dijitMenuExpandEnabled { - background-position:-16px 0px; -} - -/* TitlePane */ -.dijitRtl .dijitTitlePane .dijitClosed .dijitArrowNode { - background-position:-16px 0px; -} - -/* Tree */ -.dijitRtl .dijitTreeContainer .dijitTreeNode { - margin-left: auto; - margin-right: 19px; -} - -.dijitRtl .dijitTreeContainer .dijitTreeIsRoot { - margin-left: auto; - margin-right: 0; -} - - -.dijitRtl .dijitTreeContainer .dijitTreeContent { - margin-left: auto; - margin-right: 18px; - padding-left: auto; - padding-right: 1px; -} - -.dijitRtl .dijitTreeContainer .dijitTreeExpandoOpened { - background-image: url('images/treeExpand_minus_rtl.gif'); -} - -.dijitRtl .dijitTreeContainer .dijitTreeExpandoClosed { - background-image: url('images/treeExpand_plus_rtl.gif'); -} - -.dijitRtl .dijitTreeContainer .dijitTreeExpandoLeaf { - -} - -/* ToolTip */ -.dj_ie .dijitRtl .dijitTooltipLeft { - margin-right: 0px; - margin-left: 16px; -} - -.dj_ie .dijitRtl .dijitTooltipRight { - margin-left: 26px; - margin-right: -16px; -} -.dj_ie .dijitRtl .dijitTooltipDialog { - zoom:1 !important; -} - -/* Calendar */ -.dijitRtl .dijitCalendarDecrease { - background-position:-48px 0px; - margin-left:0; - margin-right:2px; -} -.dijitRtl .dijitCalendarIncrease { - background-position:-16px 0px; - margin-right:0; - margin-left:4px; -} - -/* Slider: an attempt, but Slider is broken in RTL in code anyway. */ -.dijitRtl .dijitHorizontalSliderIncrementIcon { background-position:-16px 0px; } -.dijitRtl .dijitHorizontalSliderDecrementIcon { background-position:-48px 0px; } \ No newline at end of file +@import url("layout/TabContainer_rtl.css"); +@import url("layout/AccordionContainer_rtl.css"); +@import url("form/Slider_rtl.css"); +@import url("form/Button_rtl.css"); +@import url("form/Common_rtl.css"); +@import url("Tree_rtl.css"); +@import url("TitlePane_rtl.css"); +@import url("Calendar_rtl.css"); +@import url("Dialog_rtl.css"); +@import url("Menu_rtl.css"); +@import url("Editor_rtl.css"); \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/templateThemeTest.html b/spring-js/src/main/resources/META-INF/dijit/themes/templateThemeTest.html index 0f2c2605..d2fe7a14 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/templateThemeTest.html +++ b/spring-js/src/main/resources/META-INF/dijit/themes/templateThemeTest.html @@ -1,186 +1,178 @@ - - - - Test Widget Templates in Multiple Themes - - - - - - - - -

Tundra

-
- - - -

- - - -

- - - -

- - - - -

- - - - - -
-
- -

Noir

-
-
-
- -

Soria

-
-
-
- -

a11y mode

-
-
-
- - - - - - - + + + + Test Widget Templates in Multiple Themes + + + + + + + + + +

Tundra

+
+ + + +

+ + + +

+ + + +

+ + + + +

+ + + + + +
+
+ +

Noir

+
+
+
+ +

Soria

+
+
+
+ +

a11y mode

+
+
+
+ + + + + + + diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/themeTester.html b/spring-js/src/main/resources/META-INF/dijit/themes/themeTester.html index dfbbbe25..6618bde7 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/themeTester.html +++ b/spring-js/src/main/resources/META-INF/dijit/themes/themeTester.html @@ -1,31 +1,21 @@ + Dijit Theme Tester - - - - - + + + + + + + + + + + + + + + + + - - - +
Loading themeTester ...
@@ -233,512 +253,662 @@ - -
-

Dijit Theme Test Page

- - -
- -
-
-

Tooltips:

-
    -
  • - rich text tooltip - - Embedded bold RICH text weirdness! - -
    • +
    -
  • anchor tooltip - tooltip on anchor -
    • +

    Dijit Theme Test Page

    -
+
-
+
+

Tooltips

+
    +
  • + rich text tooltip + + Embedded bold RICH text weirdness! + +
    • -

    Dialogs:

    +
  • anchor tooltip + tooltip on anchor +
    • +
+ + + + + + + + + + + + + + + + + +
+
tooltip below
+
I'm below!
+
+
tooltip after
+
I'm on the right!
(or left on RTL systems)
+ 		+
tooltip before
+
I'm on the left!
(or right on RTL systems)
+
+
tooltip above
+
I'm above!
+
+ +
+ +

Dialogs

+ + +
+ Show Tooltip Dialog +
+ + + + + + + + + + + +
+ +
+
+
+
+
+ +
+ +
+
+
+ +
+ + +
+ +
+

+ Selecting a color will change the background color of the page. + Use this to test how tooltips and drop downs appear with different backgrounds. +

+

3x4

+ +
+

7x10

+
+
+ + + +
+ + +
+ + + + + +
+ +

dijit.form.Textarea

+

Enabled:

+ + +
+

Disabled:

+ + + +

dijit.form.SimpleTextarea

+

+

Enabled:

+ + +

Disabled:

+ + +

dijit.Editor

+

Enabled:

+ +
+
+

Disabled:

+
+ +
+
+ + +
+ + + + +

Enabled

+
+
+
    +
  1. 0 +
  2. 100 +
+ +
+
+
    +
    +
    Slider2 Value:
    -
    - -
    +
    +
      +
      +
      +
        +
      1. lowest +
      2. normal +
      3. highest +
      + +
      +
      Value: + +
      +
      +
        +

      1. small +

      2. medium + +

      3. large +
      +
      + +

      Disabled

      +
      +
      +
        +
      1. 0 +
      2. 100 +
      + +
      +
      +
        +
        +
        +
        +
          +
          +
          +
            +
          1. lowest +
          2. normal +
          3. highest +
          + +
          + +
          +
          +
            +

          1. small +

          2. medium +

          3. large +
          +
          +
          + + + + + + - - -
          - - -
          - - - - - - - - - - -
          - -

          dijit.Editor:

          - -
          - -
          -
          - - -

          dijit.InlineEditBox + dijit.form.TextBox

          - - This is an editable header, -

          - Edit me - I trigger the onChange callback -

          - And keep the text around me static. - -
          - -

          dijit.InlineEditBox + dijit.form.Textarea

          - - (HTML before) -

          - I'm one big paragraph. Go ahead and edit me. I dare you. - The quick brown fox jumped over the lazy dog. Blah blah blah blah blah blah blah ... -

          - (HTML after) - -

          - These links will - disable / - enable - the text area above. -

          - -
          - -

          dijit.form.DateTextBox:

          - - (HTML inline before) - 12/30/2005 - (HTML after) - -
          - -

          dijit.form.TimeTextBox:

          - - (HTML inline before) - 9:00 AM - (HTML after) - -
          - - -

          dijit.form.FilteringSelect + Inline + remote data store:

          - (HTML inline before) - - Indiana - - (HTML after) - -
          - - - - -
          -
          +
          +
          - - + +
          + + +
          + + +
          +

          You can explore this single page after applying a Theme + for use in creation of your own theme.

          + +

          I am whole slew of Widgets on a page. Jump to dijit tests to + test individual components.

          + +

          There is a right-click [context] pop-up menu here, as well.

          +
          + +
          + +
          + +
          +

          I am the last Tab

          + +
          + +
          + +
          + + + diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/themeTesterQuirk.html b/spring-js/src/main/resources/META-INF/dijit/themes/themeTesterQuirk.html index 9f5e26c9..555d9799 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/themeTesterQuirk.html +++ b/spring-js/src/main/resources/META-INF/dijit/themes/themeTesterQuirk.html @@ -1,743 +1,921 @@ - - - Dijit Theme Tester - - - - - - - - - - - - - - - -
          Loading themeTester ...
          - - -
          -
          - - - - - -
          - -

          Dijit Theme Test Page

          - - -
          - -
          - -
          -

          Tooltips:

          -
            -
          • - rich text tooltip - - Embedded bold RICH text weirdness! - -
            • - -
          • anchor tooltip - tooltip on anchor -
            • - -
          - -
          - -

          Dialogs:

          - - -
          - Show Tooltip Dialog -
          - - - - - - - - - - - -
          - -
          -
          -
          -
          -
          - -
          - -
          -
          -
          - -
          - - -
          - -
          - -

          Dijit Color Palette(7x10)

          -
          -
          - Test color is: - -

          -
          -
          - - - -
          - - -
          - - - - - - - - - - -
          - -

          dijit.Editor:

          - -
          - -
          -
          - - -

          dijit.InlineEditBox + dijit.form.TextBox on <h3>

          - - (HTML before) -

          - Edit me - I trigger the onChange callback -

          - (HTML after) - -
          - -

          dijit.InlineEditBox + dijit.form.Textarea

          - - (HTML before) -

          - I'm one big paragraph. Go ahead and edit me. I dare you. - The quick brown fox jumped over the lazy dog. Blah blah blah blah blah blah blah ... -

          - (HTML after) - -

          - These links will - disable / - enable - the text area above. -

          - -
          - -

          dijit.form.DateTextBox:

          - - (HTML inline before) - 12/30/2005 - (HTML after) - -
          - -

          dijit.form.TimeTextBox:

          - - (HTML inline before) - 9:00 AM - (HTML after) - -
          - - -

          dijit.form.FilteringSelect + Inline + remote data store:

          - (HTML inline before) - - Indiana - - (HTML after) - -
          - - - - - - -
          - - -
          - - -
          -

          You can explore this single page after applying a Theme - for use in creation of your own theme.

          - -

          I am whole slew of Widgets on a page. Jump to dijit tests to - test individual components.

          - -

          There is a right-click [context] pop-up menu here, as well.

          -
          - -
          - -
          - -
          -

          I am the last Tab

          - -
          - -
          - -
          -
          - - - - - - + + + Dijit Theme Tester + + + + + + + + + + + + + + + + + + + + + + + +
          Loading themeTester ...
          + + +
          +
          + + + + + +
          + +

          Dijit Theme Test Page

          + + +
          + +
          + +
          +

          Tooltips

          +
            +
          • + rich text tooltip + + Embedded bold RICH text weirdness! + +
            • + +
          • anchor tooltip + tooltip on anchor +
            • +
          + + + + + + + + + + + + + + + + + +
          +
          tooltip below
          +
          I'm below!
          +
          +
          tooltip after
          +
          I'm on the right!
          (or left on RTL systems)
          +           		+
          tooltip before
          +
          I'm on the left!
          (or right on RTL systems)
          +
          +
          tooltip above
          +
          I'm above!
          +
          + +
          + +

          Dialogs

          + + +
          + Show Tooltip Dialog +
          + + + + + + + + + + + +
          + +
          +
          +
          +
          +
          + +
          + +
          +
          +
          + +
          + + +
          + +
          +

          + Selecting a color will change the background color of the page. + Use this to test how tooltips and drop downs appear with different backgrounds. +

          +

          3x4

          + +
          +

          7x10

          +
          +
          + + + +
          + + +
          + + + + + +
          + +

          dijit.form.Textarea

          +

          Enabled:

          + + +
          +

          Disabled:

          + + + +

          dijit.form.SimpleTextarea

          +

          +

          Enabled:

          + + +

          Disabled:

          + + +

          dijit.Editor

          +

          Enabled:

          + +
          + +
          +

          Disabled:

          +
          + +
          +
          + + +
          + + + + +

          Enabled

          +
          +
          +
            +
          1. 0 +
          2. 100 +
          + +
          +
          +
            +
            +
            Slider2 Value: +
            + +
            +
              +
              +
              +
                +
              1. lowest +
              2. normal +
              3. highest +
              + +
              +
              Value: + +
              +
              +
                +

              1. small +

              2. medium + +

              3. large +
              +
              + +

              Disabled

              +
              +
              +
                +
              1. 0 +
              2. 100 +
              + +
              +
              +
                +
                +
                +
                +
                  +
                  +
                  +
                    +
                  1. lowest +
                  2. normal +
                  3. highest +
                  + +
                  + +
                  +
                  +
                    +

                  1. small +

                  2. medium + +

                  3. large +
                  +
                  + + + +
                  + + + +
                  + +

                  dijit.InlineEditBox + dijit.form.TextBox on <h3>

                  + + (HTML before) +

                  + Edit me - I trigger the onChange callback +

                  + (HTML after) + +
                  + +

                  dijit.InlineEditBox + dijit.form.Textarea

                  + + (HTML before) +

                  + I'm one big paragraph. Go ahead and edit me. I dare you. + The quick brown fox jumped over the lazy dog. Blah blah blah blah blah blah blah ... +

                  + (HTML after) + +

                  + These links will + disable / + enable + the text area above. +

                  + +
                  + +

                  dijit.form.DateTextBox

                  + + (HTML inline before) + + (HTML after) + +
                  + +

                  dijit.form.TimeTextBox

                  + + (HTML inline before) + + (HTML after) + +
                  + + +

                  dijit.form.FilteringSelect + Inline + remote data store

                  + (HTML inline before) + + Indiana + + (HTML after) + +
                  + + + + +
                  + + +
                  + + +
                  +

                  You can explore this single page after applying a Theme + for use in creation of your own theme.

                  + +

                  I am whole slew of Widgets on a page. Jump to dijit tests to + test individual components.

                  + +

                  There is a right-click [context] pop-up menu here, as well.

                  +
                  + +
                  + +
                  + +
                  +

                  I am the last Tab

                  + +
                  + +
                  + +
                  +
                  + + + + + + diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Calendar.css b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Calendar.css index cfc5880e..5172b47a 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Calendar.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Calendar.css @@ -4,10 +4,12 @@ /* next/prev month buttons */ width:15px; height:15px; - font-size: 1px; + background-image: url("images/spriteRoundedIconsSmall.png"); + background-repeat: no-repeat } .dj_ie6 .tundra .dijitCalendarIncrementControl { - padding:.1em; + font-size:.1em; + background-image: url("images/spriteRoundedIconsSmall.gif"); } .tundra .dijitCalendarIncreaseInner, @@ -16,17 +18,10 @@ } .tundra .dijitCalendarDecrease { - background:url("images/spriteRoundedIconsSmall.png") no-repeat top left; + background-position: top left; } -.dj_ie6 .tundra .dijitCalendarDecrease { - background:url("images/spriteRoundedIconsSmall.gif") no-repeat top left; -} - .tundra .dijitCalendarIncrease { - background:url("images/spriteRoundedIconsSmall.png") no-repeat -30px top; -} -.dj_ie6 .tundra .dijitCalendarIncrease { - background:url("images/spriteRoundedIconsSmall.gif") no-repeat -30px top; + background-position: -30px top; } .tundra table.dijitCalendarContainer { @@ -45,8 +40,8 @@ text-align:center; } .dj_ie6 .tundra .dijitCalendarMonthContainer th { - padding-top:.1em; - padding-bottom:0em; + padding-top:.2em; + padding-bottom:.1em; } .tundra .dijitCalendarDayLabelTemplate { @@ -69,11 +64,6 @@ font-weight: bold; } -.dj_ie7 .tundra .dijitCalendarDateTemplate, -.dj_ie6 .tundra .dijitCalendarDateTemplate { - font-size: 0.8em; -} - .tundra .dijitCalendarDateTemplate { /* style for each day cell */ font-size: 0.9em; @@ -83,6 +73,9 @@ letter-spacing: 1px; } +.dj_ie .tundra .dijitCalendarDateTemplate { + padding: 0.1em .33em 0.02em .33em; +} .tundra .dijitCalendarPreviousMonth, .tundra .dijitCalendarNextMonth { @@ -119,6 +112,10 @@ font-weight:bold; } +.tundra .dijitCalendarHoveredDate { + background-color: #e2ebf2 !important; +} + .tundra .dijitCalendarSelectedDate { /* cell for the selected date */ background-color:#bbc4d0 !important; diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Calendar_rtl.css b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Calendar_rtl.css index c72d43b5..3a50cb82 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Calendar_rtl.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Calendar_rtl.css @@ -1,16 +1,9 @@ - /* Calendar */ -.dijitRtl .dijitCalendarDecrease { +.dijitRtl .tundra .dijitCalendarDecrease { background-position: -30px top; } -.dijitRtl .dijitCalendarIncrease { +.dijitRtl .tundra .dijitCalendarIncrease { background-position: 0px top; } -.dj_ie6 .dijitRtl .dijitCalendarIncrease { - background-position: 0px top; -} -.dj_ie6 .dijitRtl .dijitCalendarDecrease { - background-position: -30px top; -} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Dialog.css b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Dialog.css index 1782b550..fd93611f 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Dialog.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Dialog.css @@ -1,13 +1,16 @@ - /* Dialog */ - - .tundra .dijitDialog { background: #fff; border: 1px solid #7eabcd; - -webkit-box-shadow: 0px 5px 10px #adadad; + /* + filter: progid:DXImageTransform.Microsoft.DropShadow(OffX=5, OffY=5, Color='#adadad', Positive='true'); + filter: progid:DXImageTransform.Microsoft.Blur(PixelRadius=3, ShadowOpacity=.30), progid:DXImageTransform.Microsoft.Alpha(Opacity=100); + filter: progid:DXImageTransform.Microsoft.Blur(PixelRadius='5', MakeShadow='true', ShadowOpacity='0.50'); + filter: progid:DXImageTransform.Microsoft.Shadow(color='#666666', ShadowOpacity=.30, Direction=135, Strength=3); + */ padding: 0px; + -webkit-box-shadow: 0px 5px 10px #adadad; } .tundra .dijitDialog .dijitDialogTitle { @@ -19,7 +22,7 @@ .tundra .dijitDialog .dijitDialogPaneContent { background: #fff; border:none; - border-top: 1px solid #d3d3d3; /* #cddde9; /* w/out this, an

                  on the top line causes a gap between the .content and .label */ + border-top: 1px solid #d3d3d3; /* w/out this, an

                  on the top line causes a gap between the .content and .label */ padding:10px; } @@ -27,8 +30,7 @@ .tundra .dijitDialogTitleBar { /* outer container for the titlebar of the dialog */ background: #fafafa url("images/titleBar.png") repeat-x top left; - /* border: 1px solid #bfbfbf; */ - padding: 5px 6px 3px 2px; + padding: 5px 6px 3px 6px; cursor: move; outline:0; /* remove this line if keyboard focus on dialog startup is an issue. tab still takes you to first focusable element */ } @@ -36,14 +38,14 @@ .tundra .dijitDialogTitle { /* typography and styling of the dialog title */ font-weight: bold; - padding: 8px 12px 8px 12px; + padding: 4px; outline:0; } .tundra .dijitDialogCloseIcon { /* the default close icon for the dialog */ - background : url("images/spriteRoundedIconsSmall.png") no-repeat right top; - float: right; + /* background : url("images/spriteRoundedIconsSmall.png") no-repeat right top; */ + background: url("images/tabClose.png") no-repeat right top; position: absolute; vertical-align: middle; right: 6px; @@ -52,8 +54,8 @@ width: 15px; cursor: pointer; } -.dj_ie6 .tundra .dijitDialogCloseIcon { - background : url("images/spriteRoundedIconsSmall.gif") no-repeat right top; +.dj_ie .tundra .dijitDialogCloseIcon { + background : url("images/tabClose.gif") no-repeat right top; } .tundra .dijitDialogContent { @@ -67,7 +69,6 @@ .tundra .dijitTooltip, .tundra .dijitTooltipDialog { /* the outermost dom node, holding the connector and container */ - /* opacity: 0.95; */ background: transparent; /* make the area on the sides of the arrow transparent */ } @@ -86,11 +87,14 @@ The part with the text. */ background: #ffffff url("images/popupMenuBg.gif") repeat-x bottom left; - border:1px solid #7eabcd; - padding:0.45em; - -webkit-border-radius: 6px; + border: 1px solid #7eabcd; + padding: 0.45em; + -webkit-border-radius: 3px; } - +.dj_ff3 .tundra .dijitTooltipContainer { + /* only do this for FF3, because FF2 has problems with glitches */ + -moz-border-radius: 3px; +} .tundra .dijitTooltipConnector { /* the arrow piece */ border:0px; @@ -112,7 +116,8 @@ height:14px; } -.dj_ie6 .tundra .dijitTooltipBelow .dijitTooltipConnector { +.dj_ie .tundra .dijitTooltipBelow .dijitTooltipConnector { + /* use gif for IE7 too, due to png rendering problems on fade-in (see http://trac.dojotoolkit.org/ticket/6555) */ background-image: url("images/tooltipConnectorUp.gif"); } @@ -124,26 +129,28 @@ width:16px; height:14px; } -.dj_ie6 .tundra .dijitTooltipAbove .dijitTooltipConnector { +.dj_ie .tundra .dijitTooltipAbove .dijitTooltipConnector { background-image: url("images/tooltipConnectorDown.gif"); +} +.dj_ie6 .tundra .dijitTooltipAbove .dijitTooltipConnector { bottom: -3px; } .tundra .dijitTooltipLeft { padding-right: 14px; } -.dj_ie6 .tundra .dijitTooltipLeft { +.dj_ie .tundra .dijitTooltipLeft { padding-left: 15px; } .tundra .dijitTooltipLeft .dijitTooltipConnector { /* the arrow piece for tooltips to the left of an element, bottom borders aligned */ right: 0px; - bottom: 7px; + bottom: 3px; background:url("images/tooltipConnectorRight.png") no-repeat top left; width:16px; height:14px; } -.dj_ie6 .tundra .dijitTooltipLeft .dijitTooltipConnector { +.dj_ie .tundra .dijitTooltipLeft .dijitTooltipConnector { background-image: url("images/tooltipConnectorRight.gif"); } @@ -153,27 +160,25 @@ .tundra .dijitTooltipRight .dijitTooltipConnector { /* the arrow piece for tooltips to the right of an element, bottom borders aligned */ left: 0px; - bottom: 7px; + bottom: 3px; background:url("images/tooltipConnectorLeft.png") no-repeat top left; width:16px; height:14px; } -.dj_ie6 .tundra .dijitTooltipRight .dijitTooltipConnector { +.dj_ie .tundra .dijitTooltipRight .dijitTooltipConnector { background-image: url("images/tooltipConnectorLeft.gif"); } - .dj_safari .tundra .dijitPopup .dijitTooltipContainer, .dj_safari .tundra .dijitPopup .dijitMenu { /* -webkit-border-radius: 5px; */ -webkit-box-shadow: 0px 5px 10px #adadad; } - /* - * Control opacity of popups - */ -.tundra .dijitPopup > div, -.tundra .dijitPopup > table { - opacity: 0.95; +.dj_ie6 .tundra .dijitPopup .dijitTooltipContainer, +.dj_ie6 .tundra .dijitPopup .dijitMenu { + filter: progid:DXImageTransform.Microsoft.Shadow(color='#666666', Direction=135, Strength=3); } +*/ + diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Dialog_rtl.css b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Dialog_rtl.css index ea85d497..e396b578 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Dialog_rtl.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Dialog_rtl.css @@ -1,29 +1,5 @@ /* Dialog */ -.dijitRtl .dijitDialogTitleBar .dijitDialogCloseIcon { - background-position: -60px top; - float: left; +.dijitRtl .tundra .dijitDialogTitleBar .dijitDialogCloseIcon { right: auto; left: 5px; } - -/*FIXME: redundant?*/ -.dj_ie6 .dijitRtl .dijitDialogTitleBar .dijitDialogCloseIcon { - background-position: -60px top; -} - - -/* ToolTip */ - -.dj_ie .dijitRtl .dijitTooltipLeft { - margin-right: 0px; - margin-left: 13px; -} - -.dj_ie .dijitRtl .dijitTooltipRight { - margin-left: 26px; - margin-right: -13px; -} - -.dj_ie .dijitRtl .dijitTooltipDialog { - zoom:1 !important; -} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Editor.css b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Editor.css index a656cf4a..14b3fa3d 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Editor.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Editor.css @@ -15,6 +15,10 @@ height: 18px; text-align: center; } +.tundra .dijitDisabled .dijitEditorIcon { + background-image: url('images/editorDisabled.gif'); /* editor icons sprite image */ +} + .tundra .dijitEditorIconSep { background-position: 0px; } .tundra .dijitEditorIconBackColor { background-position: -18px; } .tundra .dijitEditorIconBold { background-position: -36px; } @@ -56,3 +60,6 @@ .tundra .dijitEditorIconWikiword { background-position: -684px; } .tundra .dijitEditorIconToggleDir { background-position: -540px; /* padding: 0; margin: 0; color:#555555; font-family:verdana,arial,sans-serif; font-weight: 800; font-size: 70%; */} +.tundra .dijitEditorIconTabIndent { background-position: -702px; } +.tundra .dijitEditorIconSelectAll { background-position: -720px; } +.tundra .dijitEditorIconUnlink { background-position: -738px; } diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Editor_rtl.css b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Editor_rtl.css index 2a2df3e7..c9149305 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Editor_rtl.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Editor_rtl.css @@ -1,9 +1,12 @@ /* Editor */ -.dijitRtl .dijitEditorIcon { +.dijitRtl .tundra .dijitEditorIcon { background-image: url('images/editor_rtl.gif'); /* editor icons sprite image */ } +.dijitRtl .tundra .dijitDisabled .dijitEditorIcon { + background-image: url('images/editorDisabled_rtl.gif'); /* editor icons sprite image */ +} /* Toolbar */ -.dijitRtl .dijitToolbar .dijitToolbarSeparator { +.dijitRtl .tundra .dijitToolbar .dijitToolbarSeparator { background-image: url('images/editor_rtl.gif'); } diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Menu.css b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Menu.css index 6df5e362..10eae020 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Menu.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Menu.css @@ -6,7 +6,7 @@ .tundra .dijitMenuItem { background-color: #f7f7f7; - font: menu; + font-family: sans-serif; margin: 0; } .tundra .dijitMenuPreviousButton, .tundra .dijitMenuNextButton { @@ -17,7 +17,7 @@ } .tundra .dijitMenuItemHover { - background-color: #60a1ea; + background-color: #3559ac; color:#fff; } @@ -27,17 +27,16 @@ } .tundra .dijitMenuExpand { - display:none; + width: 7px; + height: 7px; + background-image: url('images/spriteArrows.png'); + background-repeat: no-repeat; + background-position: -14px 0px; + font-size: 1px; + display: block; } -.tundra .dijitMenuExpandEnabled { - width:16px; - height:16px; - background:url('images/arrowRight.gif') no-repeat center center; - display:block; -} - -.tundra .dijitMenuExpandInner { - display:none; +.dj_ie6 .tundra .dijitMenuExpand { + background-image: url('images/spriteArrows.gif'); } .tundra .dijitMenuSeparator { @@ -51,4 +50,30 @@ .tundra .dijitMenuSeparatorBottom { border-top: 1px solid #e8e8e8; +} + +/* the checked menu item */ +.tundra .dijitCheckedMenuItemIconChar { + display: none; +} + +.tundra .dijitCheckedMenuItemIcon { + background-image: url('images/checkmark.png'); + background-position: -16px; +} + +.dj_ie6 .tundra .dijitCheckedMenuItemIcon { + background-image: url('images/checkmark.gif'); +} + +.tundra .dijitCheckedMenuItemIconChecked { + background-position: 0px; +} + +.tundra .dijitMenuItemHover .dijitCheckedMenuItemIcon { + background-position: -80px; +} + +.tundra .dijitMenuItemHover .dijitCheckedMenuItemIconChecked { + background-position: -64px; } \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Menu_rtl.css b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Menu_rtl.css index 289096c8..917676b6 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Menu_rtl.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Menu_rtl.css @@ -1,8 +1,8 @@ -.dijitRtl .dijitMenuItem .dijitMenuItemIcon { +.dijitRtl .tundra .dijitMenuItem .dijitMenuItemIcon { padding-left: 3px; padding-right: 0px; } -.dijitRtl .dijitMenuItem .dijitMenuExpandEnabled { - background-image:url('images/arrowLeft.gif'); +.dijitRtl .tundra .dijitMenuItem .dijitMenuExpand { + background-position: -7px 0px; } \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/ProgressBar.css b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/ProgressBar.css index 190c517e..5b8a118d 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/ProgressBar.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/ProgressBar.css @@ -2,13 +2,13 @@ margin:2px 0px 2px 0px; } -.tundra .dijitProgressBarEmpty{ +.tundra .dijitProgressBarEmpty { /* outer container and background of the bar that's not finished yet*/ - background:#fff url("images/progressBarEmpty.png") repeat-x top left; + background:#fff url("images/progressBarEmpty.png") repeat-x center center; border-color: #a2a2a2 #b8b8b8 #b8b8b8 #a2a2a2; } -.tundra .dijitProgressBarTile{ +.tundra .dijitProgressBarTile { /* inner container for finished portion when in 'tile' (image) mode */ background:#f0f0f0 url("images/progressBarFull.png") repeat-x center center; } diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/TimePicker.css b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/TimePicker.css new file mode 100644 index 00000000..307d45e6 --- /dev/null +++ b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/TimePicker.css @@ -0,0 +1,62 @@ +/* Time Picker */ +.tundra .dijitTimePickerTick, +.tundra .dijitTimePickerMarker { + border-color: #ccc; +} + +.tundra .dijitTimePickerTick { + color:white; +} + +.tundra .dijitTimePickerMarker { + background:#d3d3d3 url("images/titleBar.png") repeat-x top; + color:#293a4b; + font-weight: bold; +} + +.tundra .dijitTimePickerItemSelected { + color: black; + background: #bbc4d0 none; +} + +.tundra .dijitTimePickerItemHover { + background: #60a1ea none; + color:white; +} + +.tundra .dijitTimePickerItemHover, +.tundra .dijitTimePickerItemSelected { + position: relative; + z-index: 10; +} + +.tundra .dijitTimePickerTick .dijitTimePickerItemInner { + font-size:0.4em; +} + +.tundra .dijitTimePickerItemHover .dijitTimePickerItemInner, +.tundra .dijitTimePickerItemSelected .dijitTimePickerItemInner { + font-size:1em; +} + +.tundra .dijitTimePickerMarkerHover { + border-top: 1px solid #ccc; +} + +.tundra .dijitTimePickerTickHover, +.tundra .dijitTimePickerTickSelected { + margin-top:-0.3em; + margin-bottom:-0.3em; + border-bottom: none; +} + +.dijit_a11y .dijitTimePickerTickHover { + background-color: #CCC !important; + border-top: 1px solid #333 !important; + border-bottom: 1px solid #333 !important; +} + +.dijit_a11y .dijitTimePickerMarkerHover { + border-bottom-width: 2px; +} + diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/TitlePane.css b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/TitlePane.css index b4fb5960..6ffeedc2 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/TitlePane.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/TitlePane.css @@ -2,47 +2,49 @@ background: #cccccc; background:#fff url("images/titleBar.png") repeat-x bottom left; border:1px solid #bfbfbf; - padding:4px 4px 2px 4px; + padding:3px 4px; cursor: pointer; } -/* TODO: merge these, and all other icons to a series of background-image:() and background-position: -16*n px styles */ +.tundra .dijitTitlePaneTitle * { + vertical-align: middle; +} + .tundra .dijitTitlePane .dijitArrowNode { - width:16px; - height:16px; - float:right; + cursor: pointer; + background-image: url('images/spriteArrows.png'); + background-repeat: no-repeat; + height: 7px; + width: 7px; +} +.dj_ie6 .tundra .dijitTitlePane .dijitArrowNode { + background-image: url('images/spriteArrows.gif'); +} + +.tundra .dijitTitlePane .dijitOpen .dijitArrowNode { + background-position: 0px 0px; } .tundra .dijitTitlePane .dijitClosed .dijitArrowNode { - background:url('images/arrowRight.png') no-repeat center center; + background-position: -14px 0px; } .tundra .dijitTitlePaneFocused .dijitTitlePaneTextNode { text-decoration:underline; } -.dj_ie6 .tundra .dijitTitlePane .dijitClosed .dijitArrowNode { - background-image:url('images/arrowRight.gif'); -} -.tundra .dijitTitlePane .dijitOpen .dijitArrowNode { - background:url('images/arrowDown.png') no-repeat center center; -} -.dj_ie6 .tundra .dijitTitlePane .dijitOpen .dijitArrowNode { - background-image:url('images/arrowDown.gif'); -} .tundra .dijitTitlePane .dijitArrowNodeInner { - visibility:hidden; + display:none; } + .dijit_a11y .dijitTitlePane .dijitArrowNodeInner { - visibility:visible; + display:inline !important; + font-family:monospace; + cursor: pointer; + padding-bottom:.2em; } -.tundra .dijitTitlePaneTitle .dijitOpenCloseArrowOuter { - margin-right:5px; -} - -.tundra .dijitOpen .dijitTitlePaneTitle .dijitOpenCloseArrowOuter { - position:relative; - top:2px; +.dijit_a11y .dijitTitlePane .dijitArrowNode { + display:none; } .tundra .dijitTitlePaneContentOuter { @@ -58,6 +60,8 @@ .dj_ie6 .tundra .dijitTitlePane .dijitTitlePaneTitle { zoom: 1; } -.tundra .dijitClickableRegion { - background-color : #ffc !important; -} + +.tundra .dijitTitlePaneTextNode { + margin-left: 4px; + margin-right: 4px; +} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/TitlePane_rtl.css b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/TitlePane_rtl.css index e80ba770..1279d6ce 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/TitlePane_rtl.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/TitlePane_rtl.css @@ -1,6 +1,3 @@ -.dijitRtl .dijitTitlePane .dijitClosed .dijitArrowNode { - background:url('images/arrowRight.png') no-repeat center center; -} -.dj_ie6 .dijitRtl .dijitTitlePane .dijitClosed .dijitArrowNode { - background-image:url('images/arrowRight.gif'); +.dijitRtl .tundra .dijitTitlePane .dijitClosed .dijitArrowNode { + background-position: -7px 0px; } \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Toolbar.css b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Toolbar.css index 42c62efa..2ecec7d4 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Toolbar.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Toolbar.css @@ -1,32 +1,37 @@ .tundra .dijitToolbar { - padding: 3px 0 1px 3px; border-bottom: 1px solid #ccc; background:#eaeaea url("images/titleBar.png") repeat-x top left; } -.tundra .dijitToolbar .dijitButtonNode { +/* setting a min-height on ditor toolbar */ +.dj_ie6 .tundra .dijitToolbar { + height: 10px; +} + +.tundra .dijitToolbar .dijitButtonNode, +.tundra .dijitToolbar .dijitComboButton .dijitButtonContents, +.tundra .dijitToolbar .dijitComboButton .dijitDownArrowButton { background: none; - margin: 0px !important; - padding: 0px !important; + margin: 0px; + padding: 0px; border: none; font-size: 12px; } .tundra .dijitToolbar .dijitButton, .tundra .dijitToolbar .dijitToggleButton, -.tundra .dijitToolbar .dijitDropDownButton { +.tundra .dijitToolbar .dijitDropDownButton, +.tundra .dijitToolbar .dijitComboButton .dijitButtonContents, +.tundra .dijitToolbar .dijitComboButton .dijitDownArrowButton { background: none; - margin: 1px; - padding: 0px; - border: 1px solid transparent; + padding: 1px; } .tundra .dijitToolbar .dijitButtonChecked, .tundra .dijitToolbar .dijitToggleButtonChecked { background-color:#d4dff2; border:1px solid #316ac5; - margin: 1px !important; - padding: 0px !important; + padding: 0px; /* reduce padding to compensate for space taken by border */ } .tundra .dijitToolbar .dijitButtonCheckedHover, @@ -34,16 +39,18 @@ { background-color:#abc1e5; border:1px solid #316ac5; - margin: 1px !important; - padding: 0px !important; + padding: 0px; /* reduce padding to compensate for space taken by border */ } .tundra .dijitToolbar .dijitButtonHover, .tundra .dijitToolbar .dijitToggleButtonHover, -.tundra .dijitToolbar .dijitDropDownButtonHover { +.tundra .dijitToolbar .dijitDropDownButtonHover, +.tundra .dijitToolbar .dijitComboButtonHover .dijitButtonContents, +.tundra .dijitToolbar .dijitComboButtonDownArrowHover .dijitDownArrowButton { /* TODO: change this from Hover to Selected so that button is still highlighted while drop down is being used */ - border: 1px solid #316ac5; - background-color:#abc1e5; + border: 1px solid #869cbf; + padding: 0px; /* reduce padding to compensate for space taken by border */ + background-color:#e1e5f0; } .tundra .dijitToolbar label { @@ -52,44 +59,9 @@ .dj_ie .tundra .dijitToolbar .dijitComboButton .dijitButtonContentsFocused, .dj_ie .tundra .dijitToolbar .dijitComboButton .dijitDownArrowButtonFocused, -.dj_ff2 .tundra.dijitToolbar .dijitComboButton .dijitButtonContentsFocused, +.dj_ff2 .tundra .dijitToolbar .dijitComboButton .dijitButtonContentsFocused, .dj_ff2 .tundra .dijitToolbar .dijitComboButton .dijitDownArrowButtonFocused { - border: 1px black dotted !important; -} - -/* IE6 specific rules */ -.dj_ie6 .tundra .dijitToolbar .dijitButton, -.dj_ie6 .tundra .dijitToolbar .dijitToggleButton, -.dj_ie6 .tundra .dijitToolbar .dijitDropDownButton { - /* workaround no transparent border support in IE6 */ - margin: 2px; - padding: 0px 2px; - border: 0px; -} - -.dj_ie6 .tundra .dijitToolbar .dijitButtonChecked, -.dj_ie6 .tundra .dijitToolbar .dijitToggleButtonChecked, -.dj_ie6 .tundra .dijitToolbar .dijitDropDownButtonChecked { - background-color:#c1d2ee; - border:1px solid #316ac5; - margin: 1px !important; - padding: 0px 2px !important; -} - -.dj_ie6 .tundra .dijitToolbar .dijitButtonCheckedHover, -.dj_ie6 .tundra .dijitToolbar .dijitToggleButtonCheckedHover, -.dj_ie6 .tundra .dijitToolbar .dijitDropDownButtonCheckedHover { - background-color:#c1d2ee; - border:1px solid #316ac5; - margin: 1px !important; - padding: 0px 2px !important; -} - -.dj_ie6 .tundra .dijitToolbar .dijitButtonHover, -.dj_ie6 .tundra .dijitToolbar .dijitToggleButtonHover, -.dj_ie6 .tundra .dijitToolbar .dijitDropDownButtonHover { - background-color:#c1d2ee; - border:1px solid #316ac5; - margin: 1px !important; - padding: 0px 2px !important; + /* focus border doesn't appear on

                  		for FF2 or IE, so need to add it manually */ + border: 1px #555 dotted !important; + padding: 0px; } diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Tree.css b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Tree.css index b172a66f..33891520 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Tree.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Tree.css @@ -27,11 +27,7 @@ .tundra .dijitTreeContent { min-height: 18px; min-width: 18px; - margin-left:18px; - padding-top:3px; - padding-left:1px; -} - + } .tundra .dijitTreeExpand { width: 18px; @@ -51,6 +47,10 @@ background:#dde7f2; } +.tundra .dijitTreeNodeHover { + background-color: #e2ebf2 !important; +} + .tundra .dijitTreeExpandoOpened { background-image: url('images/treeExpand_minus.gif'); } @@ -70,7 +70,6 @@ .tundra .dijitTreeIcon { width: 16px; height: 16px; - padding-right: 4px; } .tundra .dijitFolderOpened { diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Tree_rtl.css b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Tree_rtl.css index 52e0135c..2464d19a 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Tree_rtl.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/Tree_rtl.css @@ -1,37 +1,30 @@ /* Tree */ -.dijitRtl .dijitTreeContainer .dijitTreeNode { +.dijitRtl .tundra .dijitTreeContainer .dijitTreeNode { background-image : url('images/i_rtl.gif'); background-position : top right; margin-left: auto; margin-right: 19px; } -.dijitRtl .dijitTreeContainer .dijitTreeIsRoot { +.dijitRtl .tundra .dijitTreeContainer .dijitTreeIsRoot { margin-left: auto; margin-right: 0; background-image: none; } -.dijitRtl .dijitTreeContainer .dijitTreeIsLast { +.dijitRtl .tundra .dijitTreeContainer .dijitTreeIsLast { background-image: url('images/i_half_rtl.gif'); } -.dijitRtl .dijitTreeContainer .dijitTreeContent { - margin-left: auto; - margin-right: 18px; - padding-left: auto; - padding-right: 1px; -} - -.dijitRtl .dijitTreeContainer .dijitTreeExpandoOpened { +.dijitRtl .tundra .dijitTreeContainer .dijitTreeExpandoOpened { background-image: url('images/treeExpand_minus_rtl.gif'); } -.dijitRtl .dijitTreeContainer .dijitTreeExpandoClosed { +.dijitRtl .tundra .dijitTreeContainer .dijitTreeExpandoClosed { background-image: url('images/treeExpand_plus_rtl.gif'); } -.dijitRtl .dijitTreeContainer .dijitTreeExpandoLeaf { +.dijitRtl .tundra .dijitTreeContainer .dijitTreeExpandoLeaf { background-image: url('images/treeExpand_leaf_rtl.gif'); } diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/form/Button.css b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/form/Button.css index 347d0772..bd264713 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/form/Button.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/form/Button.css @@ -8,24 +8,31 @@ .tundra .dijitButtonNode { /* enabled state - inner */ - /* border:1px outset #a0a0a0; */ - border:1px solid #c0c0c0; - border-bottom:1px solid #9b9b9b; - border-right:1px solid #9b9b9b; - padding: 0.2em; - background:#fff url("../images/buttonEnabled.png") repeat-x bottom left; -} -.dj_ie .tundra .dijitButtonNode { - zoom: 1; + border: 1px solid #c0c0c0; + border-bottom: 1px solid #9b9b9b; + padding: 0.1em 0.2em 0.2em 0.2em; + background: #fff url("../images/buttonEnabled.png") repeat-x bottom left; } +.tundra .dijitButtonNode button { + border: 0px; + background-color: transparent; +} + .tundra .dijitButtonText { + text-align: center; padding: 0 0.3em; } +.tundra .dijitDisabled .dijitButtonText { + color: #7F7F7F; +} + +/* .tundra .dijitComboBox .dijitButtonNode { border: 0px; } +*/ .tundra .dijitArrowButton { color: #111; @@ -37,7 +44,7 @@ .dj_ff2 .tundra .dijitComboButton .dijitButtonContentsFocused, .dj_ff2 .tundra .dijitComboButton .dijitDownArrowButtonFocused { - border: 1px black dotted !important; + border: 1px solid transparent; /*make transparent so FF2 focus rect. is visible */ } .tundra .dijitButtonDisabled .dijitButtonNode, @@ -48,20 +55,13 @@ .tundra .dijitSpinnerDisabled, .tundra .dijitSpinnerDisabled .dijitButtonNode { /* disabled state - inner */ - border-color: #d5d5d5 #bdbdbd #bdbdbd #d5d5d5; - /*color:#b4b4b4;*/ + /* border-color: #d5d5d5 #bdbdbd #bdbdbd #d5d5d5; */ + border-color: #d5d5d5 #d5d5d5 #bdbdbd #d5d5d5; background:#e4e4e4 url("../images/buttonDisabled.png") top repeat-x; - opacity: 0.60; /* Safari, Opera and Mozilla */ -} -.dj_ie .tundra .dijitButtonDisabled .dijitButtonNode *, -.dj_ie .tundra .dijitToggleButtonDisabled .dijitButtonNode *, -.dj_ie .tundra .dijitDropDownButtonDisabled .dijitButtonNode *, -.dj_ie .tundra .dijitComboButtonDisabled .dijitButtonNode *, -.dj_ie .tundra .dijitSpinnerDisabled .dijitButtonNode * { - filter: gray() alpha(opacity=50); /* IE */ } .tundra .dijitButtonHover .dijitButtonNode, +.tundra .dijitButtonNodeHover, .tundra .dijitToggleButtonHover .dijitButtonNode, .tundra .dijitDropDownButtonHover .dijitButtonNode, .tundra .dijitComboButtonHover .dijitButtonContents, @@ -71,10 +71,9 @@ .tundra .dijitSpinnerDownArrowHover .dijitDownArrowButton { /* hover state - inner */ /* TODO: change from Hover to Selected so that button is still highlighted while drop down is being used */ - border-color:#a5beda; - border-bottom-color:#5c7590; - border-right-color:#5c7590; - color:#000; + border-color: #a5beda; + border-bottom-color:#5c7590; + color:#243C5F; background:#fcfdff url("../images/buttonHover.png") repeat-x bottom; } @@ -93,21 +92,50 @@ background: #ededed url("../images/buttonActive.png") bottom repeat-x; } - - .tundra .dijitArrowButtonInner { - background:url("../images/arrowDown.png") no-repeat center center; + background-image:url("../images/spriteArrows.png"); + background-position: left top; + width: 7px; + height: 7px; + font-size: 1px; + margin: 0px 4px 0px 5px; } -.tundra .dijitUpArrowButton .dijitArrowButtonInner { background-image:url("../images/arrowUp.png"); } .dj_ie6 .tundra .dijitArrowButtonInner { - background-image:url("../images/arrowDown.gif"); + background-image:url("../images/spriteArrows.gif"); } -.dj_ie6 .tundra .dijitUpArrowButton .dijitArrowButtonInner { - background-image:url("../images/arrowUp.gif"); +.tundra .dijitDisabled .dijitArrowButtonInner { + background-position: -28px top; } +.tundra .dijitUpArrowButton .dijitArrowButtonInner { + background-position: -21px top; +} + +.tundra .dijitDisabled .dijitUpArrowButton .dijitArrowButtonInner { + background-position: -49px top; +} + + +/* Since ComboBox doesn't have it's own file... */ .tundra .dijitComboBox .dijitArrowButton .dijitArrowButtonInner { - background:url("../images/comboArrowDown.gif") no-repeat center center; + background-image: url("../images/comboArrowDown.gif"); + background-repeat: no-repeat; + background-attachment: scroll; + background-position: center center; + height: auto; + font-size: 100%; + font-size: inherit; } .tundra .dijitComboBoxHover .dijitArrowButtonInner { /* TODO: url("../images/arrowDownHover.png") but in IE6 it flickers some? */ -} \ No newline at end of file +} + +/* Since Spinner doesn't have it's own file */ +.tundra .dijitSpinner .dijitArrowButtonInner { + display: block; /* inline just isnt going to work for us here IMO */ + position:absolute; + top: 50%; + margin-top: -4px; /* half its height */ + left: 50%; + margin-left: -4px; /* half its width */ + line-height: 2px; +} diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/form/Checkbox.css b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/form/Checkbox.css index 8b7b2cc0..5a930379 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/form/Checkbox.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/form/Checkbox.css @@ -1,17 +1,26 @@ .tundra .dijitToggleButton .dijitCheckBoxIcon { + background-image: url('../images/checkmarkNoBorder.png'); +} + +.dj_ie6 .tundra .dijitToggleButton .dijitCheckBoxIcon { background-image: url('../images/checkmarkNoBorder.gif'); } .tundra .dijitCheckBox, .tundra .dijitCheckBoxIcon /* inside a toggle button */ { - background-image: url('../images/checkmark.gif'); /* checkbox sprite image */ + background-image: url('../images/checkmark.png'); /* checkbox sprite image */ background-repeat: no-repeat; width: 16px; height: 16px; - margin: 0; + margin: 0 2px 0 0; padding: 0; } +.dj_ie6 .tundra .dijitCheckBox, +.dj_ie6 .tundra .dijitCheckBoxIcon /* inside a toggle button */ { + background-image: url('../images/checkmark.gif'); /* checkbox sprite image */ +} + .tundra .dijitCheckBox, .tundra .dijitToggleButton .dijitCheckBoxIcon { /* unchecked */ @@ -34,14 +43,12 @@ background-position: -32px; } -.tundra .dijitCheckBoxHover, -.tundra .dijitCheckBoxFocused { +.tundra .dijitCheckBoxHover { /* hovering over an unchecked enabled checkbox */ background-position: -80px; } -.tundra .dijitCheckBoxCheckedHover, -.tundra .dijitCheckBoxCheckedFocused { +.tundra .dijitCheckBoxCheckedHover { /* hovering over a checked enabled checkbox */ background-position: -64px; } diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/form/Common.css b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/form/Common.css index 5bbb265b..8aabf61b 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/form/Common.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/form/Common.css @@ -20,9 +20,22 @@ .tundra .dijitTextBox, .tundra .dijitComboBox, .tundra .dijitSpinner, +.tundra .dijitTextArea { + font-family: sans-serif; + font-size: 100%; +} + +.tundra .dijitTextArea { + padding: 3px; +} + +.tundra .dijitTextBox, +.tundra .dijitComboBox, +.tundra .dijitSpinner, +.tundra .dijitTextArea, .tundra .dijitInlineEditor input { /* For all except dijit.form.NumberSpinner: the actual input element. - For TextBox, ComboBox, Spinner: the table that contains the input. + For TextBox, ComboBox, Spinner: the div that contains the input. Otherwise the actual input element. */ background:#fff url("../images/validationInputBg.png") repeat-x top left; @@ -31,18 +44,39 @@ line-height: normal; } +.tundra .dijitTextBoxDisabled, +.tundra .dijitComboBoxDisabled, +.tundra .dijitSpinnerDisabled, +.tundra .dijitTextAreaDisabled { + color: gray; +} +.dj_safari .tundra .dijitTextBoxDisabled, +.dj_safari .tundra .dijitComboBoxDisabled, +.dj_safari .tundra .dijitSpinnerDisabled, +.dj_safari .tundra .dijitTextAreaDisabled { + color: #eee; +} + +/* ComboBox specifix rules*/ +.tundra .dijitComboBox .dijitInputField { + padding: 1px 0; +} + .tundra .dijitComboBox .dijitButtonNode { - padding: 0 0.2em; + padding: 1px 0.2em; } .tundra .dijitComboBox .dijitButtonNode, .tundra .dijitSpinner .dijitButtonNode { /* line between the input area and the drop down button */ border-color: #9b9b9b; + border-width: 0px 0px 0px 1px; + border-style: solid; } .tundra .dijitTextBoxFocused, .tundra .dijitComboBoxFocused, -.tundra .dijitSpinnerFocused { +.tundra .dijitSpinnerFocused, +.tundra .dijitTextAreaFocused { /* input field when focused (ie: typing affects it) */ border-color:#406b9b; } @@ -54,7 +88,6 @@ } .tundra .dijitError { - border-color:#f3d118; background-color:#f9f7ba; background-image:none; } @@ -64,12 +97,12 @@ } .tundra .dijitErrorFocused { - background-color:#ff6; + background-color:#f9f999; background-image:none; } .dj_ie6 .tundra .dijitErrorFocused INPUT { /* background-color: transparent on an doesn't work on IE6 */ - background-color:#ff6 !important; + background-color:#f9f999 !important; } /* Validation errors */ @@ -120,7 +153,13 @@ * to the main page, rather than relative to this file... using gifs for now */ -.dj_ie6 .tundra .dijitInputField -{ - background: url("../images/validationInputBg.gif") repeat-x top left #fff; +/* The highlight is shown in the ComboBox menu. */ +.tundra .dijitComboBoxHighlightMatch { + background-color:#a5beda; +} + + +.tundra .dijitFocusedLabel { + /* for checkboxes or radio buttons, hatch border around the corresponding label, to indicate focus */ + outline: 1px dotted #666666; } diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/form/Common_rtl.css b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/form/Common_rtl.css new file mode 100644 index 00000000..857dc1fe --- /dev/null +++ b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/form/Common_rtl.css @@ -0,0 +1,6 @@ +.dijitRtl .tundra .dijitComboBox .dijitButtonNode, +.dijitRtl .dijitSpinner .dijitButtonNode { + /* line between the input area and the drop down button */ + border-color: #9b9b9b; + border-width: 0px 1px 0px 0px; +} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/form/RadioButton.css b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/form/RadioButton.css index e1d77137..d4e8daa6 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/form/RadioButton.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/form/RadioButton.css @@ -1,11 +1,16 @@ .tundra .dijitToggleButton .dijitRadio, .tundra .dijitToggleButton .dijitRadioIcon { + background-image: url('../images/checkmarkNoBorder.png'); +} + +.dj_ie6 .tundra .dijitToggleButton .dijitRadio, +.dj_ie6 .tundra .dijitToggleButton .dijitRadioIcon { background-image: url('../images/checkmarkNoBorder.gif'); } .tundra .dijitRadio, .tundra .dijitRadioIcon { /* inside a toggle button */ - background-image: url('../images/checkmark.gif'); /* checkbox sprite image */ + background-image: url('../images/checkmark.png'); /* checkbox sprite image */ background-repeat: no-repeat; width: 16px; height: 16px; @@ -13,18 +18,17 @@ padding: 0; } +.dj_ie6 .tundra .dijitRadio, +.dj_ie6 .tundra .dijitRadioIcon { /* inside a toggle button */ + background-image: url('../images/checkmark.gif'); /* checkbox sprite image */ +} + .tundra .dijitRadio, .tundra .dijitToggleButton .dijitRadioIcon { /* unselected */ background-position: -112px; } -.tundra .dijitRadioChecked, -.tundra .dijitToggleButtonChecked .dijitRadioIcon { - /* selected */ - background-position: -96px; -} - .tundra .dijitRadioDisabled { /* unselected and disabled */ background-position: -144px; @@ -35,15 +39,16 @@ background-position: -128px; } -.tundra .dijitRadioHover, -.tundra .dijitRadioFocused { +.tundra .dijitRadioHover { /* hovering over an unselected enabled radio button */ background-position: -176px; } +.tundra .dijitRadioChecked, .tundra .dijitRadioCheckedHover, -.tundra .dijitRadioCheckedFocused { - /* hovering over a selected enabled radio button */ - background-position: -160px; +.tundra .dijitToggleButtonChecked .dijitRadioIcon { + /* selected. Since clicking a selected radio button doesn't change anything, there's + * no hover effect on selected radio buttons. + */ + background-position: -96px; } - diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/form/Slider.css b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/form/Slider.css index 47797ce1..82643e98 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/form/Slider.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/form/Slider.css @@ -33,11 +33,11 @@ outline:1px; } .tundra .dijitSliderFocused .dijitSliderBar { - border-color:#333; + border-color:#888; } .dijit_a11y .dijitSliderProgressBar { - background-color:#333 !important; + background-color:#888 !important; } .tundra .dijitSliderImageHandleH { @@ -95,24 +95,37 @@ border-top-width: 1px; } +.tundra .dijitSliderDecrementIconH, +.tundra .dijitSliderDecrementIconV, .tundra .dijitSliderIncrementIconH, .tundra .dijitSliderIncrementIconV { - background:url('../images/arrowUp.png') no-repeat center center; - width:16px; height:16px; - cursor:pointer; + cursor: pointer; + background-image: url('../images/spriteArrows.png'); + background-repeat: no-repeat; + margin: 5px; + height: 7px; + width: 7px; + font-size: 1px; } -.tundra .dijitSliderIncrementIconH { - background-image:url('../images/arrowRight.png'); +.dj_ie6 .tundra .dijitSliderDecrementIconH, +.dj_ie6 .tundra .dijitSliderDecrementIconV, +.dj_ie6 .tundra .dijitSliderIncrementIconH, +.dj_ie6 .tundra .dijitSliderIncrementIconV { + background-image: url('../images/spriteArrows.gif'); } -.tundra .dijitSliderDecrementIconH, -.tundra .dijitSliderDecrementIconV { - width:16px; - height:16px; - cursor:pointer; - background:url('../images/arrowDown.png') no-repeat center center; +.tundra .dijitSliderDecrementIconH { + background-position: -7px 0px; +} +.tundra .dijitSliderIncrementIconH { + background-position: -14px 0px; +} +.tundra .dijitSliderDecrementIconV { + background-position: 0px 0px; +} +.tundra .dijitSliderIncrementIconV { + background-position: -21px 0px; } -.tundra .dijitSliderDecrementIconH { background-image:url('../images/arrowLeft.png'); } .tundra .dijitSliderButtonInner { visibility:hidden; diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/form/Slider_rtl.css b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/form/Slider_rtl.css index d6b80b82..64bf95f2 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/form/Slider_rtl.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/form/Slider_rtl.css @@ -1,31 +1,31 @@ -.dijitRtl .dijitSliderProgressBarH, -.dijitRtl .dijitSliderRemainingBarH, -.dijitRtl .dijitSliderLeftBumper, -.dijitRtl .dijitSliderRightBumper, -.dijitRtl .dijitSliderTopBumper { +.dijitRtl .tundra .dijitSliderProgressBarH, +.dijitRtl .tundra .dijitSliderRemainingBarH, +.dijitRtl .tundra .dijitSliderLeftBumper, +.dijitRtl .tundra .dijitSliderRightBumper, +.dijitRtl .tundra .dijitSliderTopBumper { background-position: top right; } -.dijitRtl .dijitSliderProgressBarV, -.dijitRtl .dijitSliderRemainingBarV, -.dijitRtl .dijitSliderBottomBumper { +.dijitRtl .tundra .dijitSliderProgressBarV, +.dijitRtl .tundra .dijitSliderRemainingBarV, +.dijitRtl .tundra .dijitSliderBottomBumper { background-position: bottom right; } -.dijitRtl .dijitSliderLeftBumper { +.dijitRtl .tundra .dijitSliderLeftBumper { border-left-width: 0px; border-right-width: 1px; } -.dijitRtl .dijitSliderRightBumper { +.dijitRtl .tundra .dijitSliderRightBumper { border-left-width: 1px; border-right-width: 0px; } -.dijitRtl .dijitSliderIncrementIconH { - background-image:url('../images/arrowLeft.png'); +.dijitRtl .tundra .dijitSliderIncrementIconH { + background-position: -7px 0px; } -.dijitRtl .dijitSliderDecrementIconH { - background-image:url('../images/arrowRight.png'); +.dijitRtl .tundra .dijitSliderDecrementIconH { + background-position: -14px 0px; } diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/accordionItemActive.gif b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/accordionItemActive.gif index f7e04a3b..ccff3835 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/accordionItemActive.gif and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/accordionItemActive.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/accordionItemHover.gif b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/accordionItemHover.gif new file mode 100644 index 00000000..96bd3a43 Binary files /dev/null and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/accordionItemHover.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/buttonActive.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/buttonActive.png index 15002b15..09417b1a 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/buttonActive.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/buttonActive.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/buttonEnabled.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/buttonEnabled.png index 2a0251a0..cf0eb205 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/buttonEnabled.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/buttonEnabled.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/buttonHover.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/buttonHover.png index 3d2a84ad..b074e4ed 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/buttonHover.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/buttonHover.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/calendarDayLabel.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/calendarDayLabel.png index 2cbc3ec9..c1a1553e 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/calendarDayLabel.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/calendarDayLabel.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/calendarMonthLabel.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/calendarMonthLabel.png index 87645dbe..fd2cf0ab 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/calendarMonthLabel.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/calendarMonthLabel.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/calendarYearLabel.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/calendarYearLabel.png index e0abe3eb..dd344f54 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/calendarYearLabel.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/calendarYearLabel.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/checkmark.gif b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/checkmark.gif index 77237aa5..ae6faa95 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/checkmark.gif and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/checkmark.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/checkmark.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/checkmark.png index b55e264a..0307109b 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/checkmark.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/checkmark.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/checkmarkNoBorder.gif b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/checkmarkNoBorder.gif index 11dc8002..324bfb3c 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/checkmarkNoBorder.gif and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/checkmarkNoBorder.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/checkmarkNoBorder.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/checkmarkNoBorder.png index f26aa57d..9cec0c0a 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/checkmarkNoBorder.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/checkmarkNoBorder.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/circleIcon.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/circleIcon.png index ca5bfd29..6f059e61 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/circleIcon.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/circleIcon.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/dndCopy.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/dndCopy.png index 660ca4fb..baecd7cf 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/dndCopy.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/dndCopy.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/dndMove.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/dndMove.png index 74af29c0..07f878cf 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/dndMove.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/dndMove.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/dndNoCopy.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/dndNoCopy.png index 87f3aa0d..9bf9c339 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/dndNoCopy.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/dndNoCopy.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/dndNoMove.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/dndNoMove.png index d75ed860..cb8bd8bd 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/dndNoMove.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/dndNoMove.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/doubleArrowDown.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/doubleArrowDown.png index b46108b5..92678d2f 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/doubleArrowDown.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/doubleArrowDown.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/doubleArrowUp.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/doubleArrowUp.png index 2c1b71cc..bba30fe9 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/doubleArrowUp.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/doubleArrowUp.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/editor.gif b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/editor.gif index 7fe7052c..127c9c43 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/editor.gif and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/editor.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/editorDisabled.gif b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/editorDisabled.gif new file mode 100644 index 00000000..9dc51036 Binary files /dev/null and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/editorDisabled.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/editorDisabled_rtl.gif b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/editorDisabled_rtl.gif new file mode 100644 index 00000000..74d407af Binary files /dev/null and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/editorDisabled_rtl.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/editor_rtl.gif b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/editor_rtl.gif index ef049380..b94d040b 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/editor_rtl.gif and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/editor_rtl.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/folderClosed.gif b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/folderClosed.gif index d32d3134..9d5fcbc6 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/folderClosed.gif and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/folderClosed.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/folderOpened.gif b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/folderOpened.gif index 45359fb6..a514c7bf 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/folderOpened.gif and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/folderOpened.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/i.gif b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/i.gif index 1336a9b5..ebd95a7a 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/i.gif and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/i.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/i_half.gif b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/i_half.gif index add395b4..2947c4fa 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/i_half.gif and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/i_half.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/i_half_rtl.gif b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/i_half_rtl.gif index 8ff8e1d3..4f60ec44 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/i_half_rtl.gif and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/i_half_rtl.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/i_rtl.gif b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/i_rtl.gif index b8a8f12a..7dafaade 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/i_rtl.gif and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/i_rtl.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/menu.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/menu.png index 4f9f70f0..f5b93d11 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/menu.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/menu.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/popupMenuBg.gif b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/popupMenuBg.gif index ae56bf3b..15f4f1b8 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/popupMenuBg.gif and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/popupMenuBg.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/preciseSliderThumb.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/preciseSliderThumb.png index 0e06640a..f2fc3387 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/preciseSliderThumb.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/preciseSliderThumb.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/preciseSliderThumbFocus.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/preciseSliderThumbFocus.png index 5fac318a..fb063237 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/preciseSliderThumbFocus.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/preciseSliderThumbFocus.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-1.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-1.png index 2069a5a2..cfc3fd2c 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-1.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-1.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-2.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-2.png index 779b22fa..d27981d6 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-2.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-2.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-3.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-3.png index 77d4f70d..3b92a7db 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-3.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-3.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-4.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-4.png index 8dad7a6b..61e4276c 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-4.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-4.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-5.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-5.png index 915f3c79..48b189ae 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-5.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-5.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-6.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-6.png index 2b607e7b..af50c4d5 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-6.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-6.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-7.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-7.png index 00d6b4b6..a4fffa30 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-7.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-7.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-8.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-8.png index e2944efc..b4c92f31 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-8.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-8.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-9.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-9.png index cf3f37dd..d8bff13a 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-9.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarAnim-9.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarEmpty.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarEmpty.png index 53918650..07f4c91e 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarEmpty.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarEmpty.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarFull.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarFull.png index dd02ee39..0ce60f55 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarFull.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/progressBarFull.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/radioButtonActive.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/radioButtonActive.png index c6b4266e..60840c78 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/radioButtonActive.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/radioButtonActive.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/radioButtonActiveDisabled.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/radioButtonActiveDisabled.png index 0fdef362..b49724e5 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/radioButtonActiveDisabled.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/radioButtonActiveDisabled.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/radioButtonActiveHover.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/radioButtonActiveHover.png index a91dc4e9..f21d4e5e 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/radioButtonActiveHover.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/radioButtonActiveHover.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/radioButtonDisabled.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/radioButtonDisabled.png index a2943d52..8da7e78f 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/radioButtonDisabled.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/radioButtonDisabled.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/radioButtonEnabled.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/radioButtonEnabled.png index 20f2e11a..4342feaf 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/radioButtonEnabled.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/radioButtonEnabled.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/radioButtonHover.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/radioButtonHover.png index 7a069737..fcb697fb 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/radioButtonHover.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/radioButtonHover.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/sliderEmpty.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/sliderEmpty.png index 0bc245a7..070c12f5 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/sliderEmpty.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/sliderEmpty.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/sliderEmptyVertical.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/sliderEmptyVertical.png index c91a4e35..45aceb7b 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/sliderEmptyVertical.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/sliderEmptyVertical.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/sliderFull.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/sliderFull.png index 6c9d0f87..4b3fcbb0 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/sliderFull.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/sliderFull.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/sliderFullFocus.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/sliderFullFocus.png index 1abdfeea..ee193560 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/sliderFullFocus.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/sliderFullFocus.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/sliderFullVertical.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/sliderFullVertical.png index 1e72421d..e7618e83 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/sliderFullVertical.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/sliderFullVertical.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/sliderFullVerticalFocus.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/sliderFullVerticalFocus.png index ad947051..3ab37e6c 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/sliderFullVerticalFocus.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/sliderFullVerticalFocus.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/sliderThumb.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/sliderThumb.png index a5a5dd6f..fe335835 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/sliderThumb.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/sliderThumb.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/sliderThumbFocus.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/sliderThumbFocus.png index 6d26e3f6..fe9763a4 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/sliderThumbFocus.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/sliderThumbFocus.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/smallArrowDown.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/smallArrowDown.png index ac7bbbf4..cabd01cd 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/smallArrowDown.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/smallArrowDown.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/smallArrowUp.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/smallArrowUp.png index d26812d0..a4dd6706 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/smallArrowUp.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/smallArrowUp.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/splitContainerSizerH-thumb.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/splitContainerSizerH-thumb.png index 87b459cb..e7bc204d 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/splitContainerSizerH-thumb.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/splitContainerSizerH-thumb.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/splitContainerSizerH.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/splitContainerSizerH.png index 4b27d8ae..0e5e4715 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/splitContainerSizerH.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/splitContainerSizerH.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/splitContainerSizerV-thumb.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/splitContainerSizerV-thumb.png index 69e02b18..410a0a7a 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/splitContainerSizerV-thumb.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/splitContainerSizerV-thumb.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/splitContainerSizerV.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/splitContainerSizerV.png index f1d71952..6781f0ea 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/splitContainerSizerV.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/splitContainerSizerV.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/spriteArrows.gif b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/spriteArrows.gif new file mode 100644 index 00000000..56a37f43 Binary files /dev/null and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/spriteArrows.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/spriteArrows.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/spriteArrows.png new file mode 100644 index 00000000..e0229c9f Binary files /dev/null and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/spriteArrows.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tabActive.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tabActive.png index 7271066d..eaf1ed48 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tabActive.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tabActive.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tabClose.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tabClose.png index efed5c7b..136cd220 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tabClose.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tabClose.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tabCloseHover.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tabCloseHover.png index ee5f2db1..290e77f5 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tabCloseHover.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tabCloseHover.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tabDisabled.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tabDisabled.png index f891b37b..ea0f6172 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tabDisabled.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tabDisabled.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tabEnabled.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tabEnabled.png index fb750a05..d40cf452 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tabEnabled.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tabEnabled.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tabHover.gif b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tabHover.gif index a0193d45..471e0eee 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tabHover.gif and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tabHover.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tabHover.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tabHover.png index 259b075f..16487f1d 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tabHover.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tabHover.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/titleBar.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/titleBar.png index 1835944f..617d9d42 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/titleBar.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/titleBar.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorDown.gif b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorDown.gif index f96fca4a..18b27951 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorDown.gif and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorDown.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorDown.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorDown.png index cc345a66..1aff5a3c 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorDown.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorDown.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorLeft.gif b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorLeft.gif index 4d0a88c7..3d9cbc54 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorLeft.gif and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorLeft.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorLeft.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorLeft.png index 3026ca56..e68fec3d 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorLeft.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorLeft.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorRight.gif b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorRight.gif index 4e22c1a6..2b887f79 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorRight.gif and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorRight.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorRight.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorRight.png index a7f91130..dc2434a1 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorRight.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorRight.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorUp.gif b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorUp.gif index 37729b84..d0cad8a2 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorUp.gif and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorUp.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorUp.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorUp.png index bf13c713..55a378b8 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorUp.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/tooltipConnectorUp.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_leaf.gif b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_leaf.gif index 1a09ebec..4b1c6c15 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_leaf.gif and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_leaf.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_leaf_rtl.gif b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_leaf_rtl.gif index 067d534d..b563d7c6 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_leaf_rtl.gif and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_leaf_rtl.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_loading.gif b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_loading.gif index b6d53b9d..424d376a 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_loading.gif and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_loading.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_minus.gif b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_minus.gif index c8b6cf2c..59777823 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_minus.gif and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_minus.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_minus_rtl.gif b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_minus_rtl.gif index cb09f9ea..cf50054b 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_minus_rtl.gif and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_minus_rtl.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_plus.gif b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_plus.gif index f42a84ba..2b96a555 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_plus.gif and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_plus.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_plus_rtl.gif b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_plus_rtl.gif index 0863d9cf..11f99167 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_plus_rtl.gif and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/treeExpand_plus_rtl.gif differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/validationInputBg.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/validationInputBg.png index 9c4fc2e0..d222fb4e 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/validationInputBg.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/validationInputBg.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/warning.png b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/warning.png index c8ca2d19..c52f83dc 100644 Binary files a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/warning.png and b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/images/warning.png differ diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/layout/AccordionContainer.css b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/layout/AccordionContainer.css index 14d46aeb..42b8edf2 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/layout/AccordionContainer.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/layout/AccordionContainer.css @@ -1,5 +1,28 @@ /* Accordion */ +.tundra .dijitAccordionContainer { + border-color: #ccc; +} + +/* nested classes */ + +.tundra .dijitTabContainer-dijitAccordionContainer { + border: none; +} + +.tundra .dijitAccordionContainer-dijitAccordionContainer { + border: none; + background-color: #fff; +} + +.tundra .dijitSplitContainer-dijitAccordionContainer, +.tundra .dijitBorderContainer-dijitAccordionContainer { + border: 1px #ccc solid; + background-color: #fff; +} + +/* common */ + .tundra .dijitAccordionPane { background-color: #e7e7e7; } @@ -7,31 +30,23 @@ .tundra .dijitAccordionTitle { background:#fafafa url("../images/titleBar.png") repeat-x bottom left; border-top: 1px solid #bfbfbf; - padding: 6px 4px 6px 8px; + padding: 4px 4px 4px 8px; cursor:pointer; } +.tundra .dijitAccordionTitle-hover { + background: #f8fafd url("../images/accordionItemHover.gif") bottom repeat-x; +} + .tundra .dijitAccordionTitle-selected { background: #f9f9f9 url("../images/accordionItemActive.gif") bottom repeat-x; font-weight: bold; border-top: 1px solid #aaaaaa; border-bottom: 1px solid #bfbfbf; - padding: 6px 4px 6px 8px; + padding: 4px 4px 4px 8px; cursor: default; } -.tundra .dijitAccordionArrow { - background:url("../images/plusButton.gif") no-repeat; - width:15px; - height:15px; - margin-top:2px; -} - -.tundra .dijitAccordionTitle-selected .dijitAccordionArrow { - background:none; - margin-top:2px; -} - .tundra .dijitAccordionBody { background: #fff; } diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/layout/BorderContainer.css b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/layout/BorderContainer.css index da281067..28b6c1fc 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/layout/BorderContainer.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/layout/BorderContainer.css @@ -1,10 +1,19 @@ /* BorderContainer */ -.tundra .dijitSplitterH { - background:url("../images/splitContainerSizerH.png") repeat-x #fff; +.tundra .dijitBorderContainer { + background-color: #fcfcfc; + padding: 5px; +} + +.tundra .dijitBorderContainer-dijitBorderContainer { + border: none; + padding: 0px; +} + +.tundra .dijitSplitterH, +.tundra .dijitGutterH { + background:#fcfcfc; border:0; - border-left:0px solid #d3d3d3; - border-right:0px solid #d3d3d3; height:5px; } @@ -15,11 +24,10 @@ height:2px; } -.tundra .dijitSplitterV { - background:url("../images/splitContainerSizerV.png") repeat-y #fff; +.tundra .dijitSplitterV, +.tundra .dijitGutterV { + background:#fcfcfc; border:0; - border-top:0px solid #d3d3d3; - border-bottom:0px solid #d3d3d3; width:5px; } @@ -29,3 +37,14 @@ height:19px; width:5px; } + +/* active splitter */ +.tundra .dijitSplitterActive { + font-size: 1px; + background-image: none; + background-color: #aaa; + -moz-opacity: 0.6; + opacity: 0.6; + filter: Alpha(Opacity=60); + margin: 0; +} diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/layout/ContentPane.css b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/layout/ContentPane.css new file mode 100644 index 00000000..3fd65a1e --- /dev/null +++ b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/layout/ContentPane.css @@ -0,0 +1,23 @@ +/* ContentPane */ + +.tundra .dijitContentPane { + padding: 0px; +} + +/* nested layouts */ +.tundra .dijitTabContainerTop-dijitContentPane, +.tundra .dijitTabContainerLeft-dijitContentPane, +.tundra .dijitTabContainerBottom-dijitContentPane, +.tundra .dijitTabContainerRight-dijitContentPane, +.tundra .dijitAccordionContainer-dijitContentPane { + border: none; + background-color: #fff; + padding: 5px; +} + +.tundra .dijitSplitContainer-dijitContentPane, +.tundra .dijitBorderContainer-dijitContentPane { + border: 1px #ccc solid; + background-color: #fff; + padding: 5px; +} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/layout/TabContainer.css b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/layout/TabContainer.css index ee3ff6bd..59a8e2dd 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/layout/TabContainer.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/layout/TabContainer.css @@ -1,101 +1,74 @@ - -/* Tabs */ - +/* Tabs, shared classes */ .tundra .dijitTabPaneWrapper { - /* - overflow: hidden; - */ background:#fff; border:1px solid #ccc; + margin: 0; + padding: 0; } .tundra .dijitTab { line-height:normal; - margin-right:5px; /* space between one tab and the next in top/bottom mode */ + margin-right:4px; /* space between one tab and the next in top/bottom mode */ padding:0px; border:1px solid #ccc; background:#e2e2e2 url("../images/tabEnabled.png") repeat-x; } -.tundra .dijitAlignLeft .dijitTab, -.tundra .dijitAlignRight .dijitTab { - margin-right:0px; - margin-bottom:5px; /* space between one tab and the next in left/right mode */ -} - .tundra .dijitTabInnerDiv { - padding:6px 10px 4px 10px; - border-left:1px solid #fff; - border-bottom:1px solid #fff; + padding:6px 8px 5px 9px; } -.tundra .dijitTabHover, -.tundra .dijitTabCloseButtonHover { - color: #243C5F; - border-top-color:#92a0b3; - border-left-color:#92a0b3; - border-right-color:#92a0b3; - background:#e2e2e2 url("../images/tabHover.png") repeat-x bottom; +.dijitTabSpacer { + font-size: 1px; } -.dj_ie6 .tundra .dijitTabHover, -.dj_ie6 .tundra .dijitTabCloseButtonHover { - background-image: url("../images/tabHover.gif"); -} - -.tundra .dijitTabChecked, -.tundra .dijitTabCloseButtonChecked -{ +/* checked tab*/ +.tundra .dijitTabChecked { /* the selected tab (with or without hover) */ background-color:#fff; border-color: #ccc; background-image:none; } -/* make the active tab white on the side next to the content pane */ -.tundra .dijitAlignTop .dijitTabChecked, -.tundra .dijitAlignTop .dijitTabCloseButtonChecked -{ - border-bottom-color:white; - vertical-align:bottom; +/* hovered tab */ +.tundra .dijitTabHover { + color: #243C5F; + border-top-color:#92a0b3; + border-left-color:#92a0b3; + border-right-color:#92a0b3; + background:#e2e2e2 url("../images/tabHover.gif") repeat-x; } -.tundra .dijitAlignBottom .dijitTabChecked, -.tundra .dijitAlignBottom .dijitTabCloseButtonChecked -{ - border-top-color:white; - -moz-border-radius:2px 2px 0px 0px; /* eliminate some border detritrus on moz */ +.tundra .dijitTabCheckedHover { + color: inherit; + border:1px solid #ccc; + background:#fff; } -.tundra .dijitAlignLeft .dijitTabChecked, -.tundra .dijitAlignLeft .dijitTabCloseButtonChecked -{ - border-right-color:white; -} - -.tundra .dijitAlignRight .dijitTabChecked, -.tundra .dijitAlignRight .dijitTabCloseButtonChecked -{ - border-left-color:white; -} - - -/* make space for a positioned close button */ -.tundra .dijitTab .dijitClosable { - position: relative; - padding:6px 20px 4px 10px; +.tundra .dijitTab .dijitClosable .closeNode { + /* Inline-block */ + display:-moz-inline-box; /* FF2 */ + display:inline-block; /* webkit and FF3 */ + #zoom: 1; /* set hasLayout:true to mimic inline-block */ + #display:inline; /* don't use .dj_ie since that increases the priority */ + vertical-align:top; + width: 1em; + height: 1em; + padding: 0; + margin: 0; } .tundra .dijitTab .dijitClosable .closeImage { - position:absolute; - top: 7px; - right: 3px; - height: 12px; - width: 12px; - padding: 0; - margin: 0; background: url("../images/tabClose.png") no-repeat right top; + width: 12px; + height: 12px; } + +.tundra .dijitTab .dijitTabButtonSpacer { + height: 12px; + width: 1px; +} + .dj_ie6 .dijitTab .dijitClosable .closeImage { background-image:url("../images/tabClose.gif"); } @@ -114,25 +87,151 @@ background-image : url("../images/tabCloseHover.gif"); } -.tundra .dijitAlignLeft .dijitTab .dijitClosable { - padding:6px 10px 4px 20px; +/* ================================ */ +/* top tabs */ +.tundra .dijitTabContainerTop-tabs { + margin-bottom: -1px; + border-color: #ccc; } -/* correct for IE6. - We cant force hasLayout as that blows out the shrink wrapped tabs - ..so we shim in the closeImage position properties instead -*/ -.dj_ie6 .tundra .dijitAlignLeft .dijitTab .dijitClosable .closeImage { - left:-20px; +/* top container */ +.tundra .dijitTabContainerTop-container { + border-top: none; } -.tundra .dijitAlignBottom .dijitTab .dijitClosable .closeImage { - top: auto; - bottom: 7px; - right: 3px; +/* checked tabs */ +.tundra .dijitTabContainerTop-tabs .dijitTabChecked { + border-bottom-color:white; } -.tundra .dijitAlignLeft .dijitTab .dijitClosable .closeImage { - top: 7px; - left: 3px; +/* strip */ +.tundra .dijitTabContainerTopStrip { + border: 1px solid #ccc; + padding-top: 2px; + padding-left: 3px; +} + +.tundra .dijitTabContainerTopStrip { + background: #f2f2f2; +} + +/* ================================ */ +/* bottom tabs */ +.tundra .dijitTabContainerBottom-tabs { + margin-top: -1px; + border-color: #ccc; +} + +/* bottom container */ +.tundra .dijitTabContainerBottom-container { + border-bottom: none; +} + +/* checked tabs */ +.tundra .dijitTabContainerBottom-tabs .dijitTabChecked { + border-top-color:white; +} + +/* strip */ +.tundra .dijitTabContainerBottomStrip { + padding-bottom: 2px; + padding-left: 3px; + border: 1px solid #ccc; +} + +.tundra .dijitTabContainerBottomStrip { + background: #f2f2f2; +} + +/* top/bottom strip */ +.tundra .dijitTabContainerBottom-spacer, +.tundra .dijitTabContainerTop-spacer { + height: 0px; + border-top: 1px solid #ccc; + background: #fff; +} + + +/* ================================ */ +/* right tabs */ +.tundra .dijitTabContainerRight-tabs { + margin-left: -1px; + border-color: #ccc; +} + +/* right container */ +.tundra .dijitTabContainerRight-container { + border-right: none; +} + +/* checked tabs */ +.tundra .dijitTabContainerRight-tabs .dijitTabChecked { + border-left-color:white; +} + +/* strip */ +.tundra .dijitTabContainerRightStrip { + padding-right: 2px; + padding-top: 3px; + border: 1px solid #ccc; +} + +.tundra .dijitTabContainerRightStrip { + background: #f2f2f2; +} + +/* ================================ */ +/* left tabs */ +.tundra .dijitTabContainerLeft-tabs { + margin-right: -1px; + border-color: #ccc; +} + +/* left conatiner */ +.tundra .dijitTabContainerLeft-container { + border-left: none; +} + +/* checked tabs */ +.tundra .dijitTabContainerLeft-tabs .dijitTabChecked { + border-right-color:white; +} + +/* strip */ +.tundra .dijitTabContainerLeftStrip { + padding-left: 2px; + padding-top: 3px; + border: 1px solid #ccc; +} + +.tundra .dijitTabContainerLeftStrip { + background: #f2f2f2; +} + +/* ================================ */ +/* left/right tabs */ +.tundra .dijitTabContainerLeft-tabs .dijitTab, +.tundra .dijitTabContainerRight-tabs .dijitTab { + margin-right:0px; + margin-bottom:4px; /* space between one tab and the next in left/right mode */ +} + +/* left/right tabstrip */ +.tundra .dijitTabContainerLeft-spacer, +.tundra .dijitTabContainerRight-spacer { + width: 0px; + border-left: 1px solid #ccc; + background: #fff; +} + + +/* ================================ */ + +/* this resets the tabcontainer stripe when within a contentpane */ +.tundra .dijitTabContainerTop-dijitContentPane .dijitTabContainerTop-tabs { + border-left: 0px solid #ccc; + border-top: 0px solid #ccc; + border-right: 0px solid #ccc; + padding-top: 0px; + padding-left: 0px; } diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/layout/TabContainer_rtl.css b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/layout/TabContainer_rtl.css index 4ccc03a6..4fe2ed30 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/layout/TabContainer_rtl.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/layout/TabContainer_rtl.css @@ -1,89 +1,38 @@ -.dijitRtl .dijitTab { - margin-right:0; - margin-left:5px; /* space between one tab and the next in top/bottom mode */ +.dijitRtl .tundra .dijitTab { + margin-right:auto; + margin-left:4px; /* space between one tab and the next in top/bottom mode */ + -moz-box-orient:horizontal; + text-align: right; } -.dijitRtl .dijitTab .dijitTabInnerDiv { - border-left:none; - border-right:1px solid #fff; +/* tab strips */ +.dijitRtl .tundra .dijitTabContainerTopStrip, +.dijitRtl .tundra .dijitTabContainerBottomStrip { + padding-right: 3px; + padding-left: 0px; } -.dijitRtl .dijitTab .dijitClosable { - padding: 6px 10px 4px 20px; +.dijitRtl .tundra .dijitTabInnerDiv { + padding:6px 9px 5px 8px; } -.dijitRtl .dijitTab .closeImage { - position:static; - padding: 0px 12px 0px 0px; +.dijitRtl .tundra .dijitTabPaneWrapper { + #zoom: 1; } -.dj_gecko .dijitTab .closeImage { - position:relative; - float:none; - padding:0; +.dj_ie-rtl .tundra .dijitTabContainerLeft-tabs { + margin-left: 1px !important; } -.dijitRtl .dijitTab .dijitClosable .closeImage { - right:auto; - left:3px; - background-position: left top; +.dj_ie-rtl .tundra .dijitTabContainerRight-tabs { + margin-right: 1px !important; } -.dj_ie .dijitRtl .dijitTab .dijitClosable .closeImage { - width:12px !important; -} - -.dijitRtl .dijitAlignLeft .dijitTab, -.dijitRtl .dijitAlignRight .dijitTab { +.dijitRtl .tundra .dijitTabContainerLeft-tabs .dijitTab, +.dijitRtl .tundra .dijitTabContainerRight-tabs .dijitTab { margin-left:0px; } -.dijitRtl .dijitAlignBottom .dijitTab .dijitClosable .closeImage { - right:auto; - left:3px; -} - -.dijitRtl .dijitAlignRight .dijitTab .dijitTabInnerDiv { - padding-left:10px; - padding-right:20px; -} - -.dijitRtl .dijitAlignLeft .dijitTab .dijitTabInnerDiv { - padding-left:20px; - padding-right:10px; -} - -.dj_ie .dijitRtl .dijitAlignLeft .dijitTab .dijitTabInnerDiv { - padding-left:19px; -} - -.dj_gecko .dijitRtl .dijitAlignLeft .dijitTab .dijitTabInnerDiv { - padding-left:11px; -} - -.dijitRtl .dijitAlignRight .dijitTab .dijitClosable .closeImage { - left:auto; - right:3px; -} - -.dj_ie7 .dijitRtl .dijitAlignLeft .dijitTab .dijitTabContent{ - position:relative; -} - -.dj_ie7 .dijitRtl .dijitAlignLeft .dijitTab .dijitClosable .closeImage{ - position:absolute; - top:2px; - left:3px; -} - -.dj_ie6 .dijitRtl .dijitAlignLeft .dijitTab .dijitClosable .closeImage{ - float:left; -} - -.dj_ie6 .dijitRtl .dijitAlignLeft .dijitTab .dijitClosable .tabLabel{ - float:right; -} - -.dj_ie .dijitTab .dijitTabInnerDiv{ +.dj_ie .tundra .dijitTab .dijitTabInnerDiv{ width : 1%; } \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/tundra.css b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/tundra.css index 4b3d2ab5..5e4f975b 100644 --- a/spring-js/src/main/resources/META-INF/dijit/themes/tundra/tundra.css +++ b/spring-js/src/main/resources/META-INF/dijit/themes/tundra/tundra.css @@ -1,1465 +1,49 @@ /* Adds cosmetic styling to Dijit. Users may swap with a custom theme CSS file. + + NOTES: + --- + Dialog.css contains css classes for both Dialog and Tooltip! + This because currently a dijit.TooltipDialog exist. Until this is resolved + you need to include Dialog.css for both dijits + --- + Toolbar.css contains classes also used in Editor. Until this is resolved + you need to include Toolbar.css for both Toolbar and Editor + --- + Button.css contains classes for combobox, + */ - @import url("../dijit.css"); - - -.dj_safari .tundra .dijitPopup { - /* -webkit-border-radius: 5px; */ - -webkit-box-shadow: 0px 5px 10px #adadad; -} - -/* - * Control opacity of popups - */ -.tundra .dijitPopup div, -.tundra .dijitPopup table { - opacity: 0.95; -} - -/***** - dijit.form.Button - dijit.form.DropDownButton - dijit.form.ComboButton - dijit.form.ComboBox (partial) - *****/ - -.tundra .dijitButtonNode { - /* enabled state - inner */ - /* border:1px outset #a0a0a0; */ - border:1px solid #9b9b9b; - vertical-align: middle; - padding: 0.2em 0.2em; - background:#e9e9e9 url("images/buttonEnabled.png") repeat-x top; -} -.dj_ie .tundra .dijitButtonNode { - zoom: 1; - padding-bottom: 0.1em; -} - -/* button inner contents - labels, icons etc. */ -.tundra .dijitButtonNode * { - display: -moz-inline-box; - display: inline-block; - vertical-align: middle; -} -.dj_ie .tundra .dijitButtonNode * { - zoom: 1; - display:inline; -} -.tundra .dijitButtonText { - padding: 0 0.3em; -} - -.tundra .dijitComboBox .dijitButtonNode, -.tundra .dijitSpinner .dijitButtonNode { - border: 0px; - padding: 1px .4em; /* the inner node will be vertically centered automatically because it's in a */ -} - -.tundra .dijitA11yDownArrow, -.tundra .dijitDownArrowButton, -.tundra .dijitUpArrowButton { - font-size: 0.75em; - color: #848484; -} - - -.tundra .dijitButtonDisabled .dijitButtonNode, -.tundra .dijitToggleButtonDisabled .dijitButtonNode, -.tundra .dijitDropDownButtonDisabled .dijitButtonNode, -.tundra .dijitComboButtonDisabled .dijitButtonNode, -.tundra .dijitComboBoxDisabled, -.tundra .dijitSpinnerDisabled, -.tundra .dijitSpinnerDisabled .dijitButtonNode { - /* disabled state - inner */ - border: 1px solid #d5d5d5; - /*color:#b4b4b4;*/ - background:#e4e4e4 url("images/buttonDisabled.png") top repeat-x; - opacity: 0.60; /* Safari, Opera and Mozilla */ -} -.tundra .dijitButtonDisabled .dijitButtonNode *, -.tundra .dijitToggleButtonDisabled .dijitButtonNode *, -.tundra .dijitDropDownButtonDisabled .dijitButtonNode *, -.tundra .dijitComboButtonDisabled .dijitButtonNode *, -.tundra .dijitSpinnerDisabled .dijitButtonNode * { - filter: gray() alpha(opacity=50); /* IE */ -} - -.tundra .dijitButtonHover .dijitButtonNode, -.tundra .dijitToggleButtonHover .dijitButtonNode, -.tundra .dijitDropDownButtonHover .dijitButtonNode, -.tundra .dijitComboButtonHover .dijitButtonContents, -.tundra .dijitComboButtonDownArrowHover .dijitDownArrowButton, -.tundra .dijitComboBoxHover .dijitDownArrowButton, -.tundra .dijitSpinnerUpArrowHover .dijitUpArrowButton, -.tundra .dijitSpinnerDownArrowHover .dijitDownArrowButton { - /* hover state - inner */ - /* TODO: change from Hover to Selected so that button is still highlighted while drop down is being used */ - border-color:#366dba; - color:#366dba; - background:#f1f6fc url("images/buttonHover.png") repeat-x bottom; -} - -.tundra .dijitButtonActive .dijitButtonNode, -.tundra .dijitToggleButtonActive .dijitButtonNode, -.tundra .dijitDropDownButtonActive .dijitButtonNode, -.tundra .dijitComboButtonActive .dijitButtonContents, -.tundra .dijitDownArrowActive .dijitDownArrowButton, -.tundra .dijitComboBoxActive .dijitDownArrowButton { - /* active state - inner (for when you are pressing a normal button, or - * when a toggle button is in a depressed state - */ - border-color:#366dba; - background: #ededed url("images/buttonActive.png") bottom repeat-x; -} - -.tundra .dijitToolbar { - border: 1px solid #9b9b9b; - background:#e9e9e9 url("images/buttonEnabled.png") repeat-x top; -} - -.tundra .dijitToolbar * { - padding: 0px; - margin: 0px; - /* #margin-top: -1px; */ - /*IE*/ -} -.dj_ie .tundra .dijitToolbar { - padding-bottom: 1px; -} - -.tundra .dijitToolbar .dijitButtonNode { - padding: 0px; - margin: 0px; - border: 1px solid transparent; - background: none; - _margin: 1px; - _padding: 0px 1px 0px 1px; - _border: 0px; -} - -.tundra .dijitToolbar .dijitToggleButtonChecked .dijitButtonNode { - background-color:#C1D2EE; - border:1px solid #316AC5; -} -.tundra .dijitToolbar .dijitToggleButtonCheckedHover .dijitButtonContents { - border-color: #366dba; - background-color:transparent; -} -.dj_ie6 .tundra .dijitToolbar .dijitButtonNode { - /* workaround no transparent border support in IE6*/ - border-color: #e9e9e9; -} - -.tundra .dijitToolbar .dijitButtonHover .dijitButtonNode, -.tundra .dijitToolbar .dijitToggleButtonHover .dijitButtonNode, -.tundra .dijitToolbar .dijitDropDownButtonHover .dijitButtonNode { - /* TODO: change this from Hover to Selected so that button is still highlighted while drop down is being used */ - border-color: #366dba; - /* IE hackery */ - _border: 1px solid #366dba; - _margin: -1px 0px 0px 0px; - _padding: 0px; -} - -.dijitToolbarSeparator { - background: url('images/editor.gif'); - height: 18px; - width: 5px; - padding: 0px 1px 0px 1px; - margin: 0px; -} - -.tundra .dijitToolbar .dijitToolbarSeparator { - background: url('images/editor.gif'); -} - -/* ComboBox-icon-specific */ -.tundra .dijitComboBox .dijitDownArrowButtonChar { - /* visibility:hidden; */ - display:none; -} -.dijit_a11y .dijitComboBox .dijitDownArrowButtonChar { - display:inline; -} -.tundra .dijitComboBox .dijitDownArrowButtonInner { - width:16px; - height:16px; - background:url("images/arrowDown.png") no-repeat center center; -} -.dj_ie6 .tundra .dijitComboBox .dijitDownArrowButtonInner { - background-image:url("images/arrowDown.gif"); -} -.tundra .dijitComboBoxHover .dijitDownArrowButtonInner { - /* TODO: url("images/arrowDownHover.png") but in IE6 it flickers some? */ -} - - -/***** - dijit.form.NumberSpinner - override for the shorter stacked buttons - *****/ - -.tundra .dijitSpinner .dijitButtonNode { - padding: 0 .4em 0 .4em; -} - - -/**** - dijit.form.TextBox - dijit.form.ValidationTextBox - dijit.form.SerializableTextBox - dijit.form.RangeBoundTextBox - dijit.form.NumberTextBox - dijit.form.CurrencyTextBox - dijit.form.NumberSpinner - dijit.form.ComboBox (partial) - ****/ - -.tundra .dijitInputField INPUT, -.tundra .dijitTextBox, -.tundra .dijitComboBox, -.tundra .dijitSpinner { - margin: 0em 0.1em 0.0em 0.1em; -} - -.tundra .dijitTextBox, -.tundra .dijitComboBox, -.tundra .dijitSpinner, -.tundra .dijitInlineEditor input, -.tundra .dijitTextArea { - /* For all except dijit.form.NumberSpinner: the actual input element. - For TextBox, ComboBox, Spinner: the table that contains the input. - Otherwise the actual input element. - */ - background:#fff url("images/validationInputBg.png") repeat-x top left; - #background:#fff url('images/validationInputBg.gif') repeat-x top left; - border:1px solid #9b9b9b; - line-height: normal; -} - -.dj_safari .tundra INPUT.dijitTextBox { - padding:0.15em 0em; /* make it roughly the same size as a validation input box */ -} - -.dj_ie .tundra INPUT.dijitTextBox, -.dj_ie .tundra TD.dijitInputField, -.dj_ie .tundra .dijitInputField INPUT { - height: 1.2em; /* needed since the INPUT is position:absolute */ -} - -.tundra .dijitComboBox .dijitButtonNode, -.tundra .dijitSpinner .dijitButtonNode { - /* line between the input area and the drop down button */ - border-left:1px solid #9b9b9b; -} -.tundra .dijitSpinner .dijitDownArrowButton { - border-top:1px solid #9b9b9b; /* line between top and bottom arrow */ -} - -.tundra .dijitTextBoxFocused, -.tundra .dijitComboBoxFocused, -.tundra .dijitSpinnerFocused { - /* input field when focused (ie: typing affects it) */ - border-color:#366dba; -} -.tundra .dijitComboBoxFocused .dijitButtonNode, .tundra .dijitSpinnerFocused .dijitButtonNode { - border-left:1px solid #366dba; -} -.tundra .dijitSpinnerFocused .dijitDownArrowButton { - border-top:1px solid #366dba; -} - -.tundra .dijitTextBoxError, -.tundra .dijitComboBoxError, -.tundra .dijitSpinnerError { - border:1px solid #f3d118; - background-color:#f9f7ba; - background-image:none; -} -.dj_ie6 .tundra .dijitTextBoxError input, -.dj_ie6 .tundra .dijitComboBoxError input, -.dj_ie6 .tundra .dijitSpinnerError input { - /* background-color: transparent on an doesn't work on IE6 */ - background-color:#f9f7ba !important; -} - -.tundra .dijitTextBoxErrorFocused, -.tundra .dijitComboBoxErrorFocused, -.tundra .dijitSpinnerErrorFocused { - background-color:#ff6; - background-image:none; -} -.dj_ie6 .tundra .dijitTextBoxErrorFocused input, -.dj_ie6 .tundra .dijitComboBoxErrorFocused input, -.dj_ie6 .tundra .dijitSpinnerErrorFocused input { - /* background-color: transparent on an doesn't work on IE6 */ - background-color:#ff6 !important; -} - -/* Validation errors */ -.tundra .dijitValidationIcon { - /* prevent height change when widget goes from valid to invalid state, and - * workaround browser (FF and safari) sizing bugs when last table column is empty or display:null - */ - display: block; - width: 16px; - height: 16px; - background-repeat: no-repeat; - background-image: url('images/warning.png'); - visibility: hidden; -} -.tundra .dijitValidationIconText { - display: none; -} - -.tundra .dijitTextBoxError .dijitValidationIcon, -.tundra .dijitComboBoxError .dijitValidationIcon, -.tundra .dijitSpinnerError .dijitValidationIcon { - visibility: visible; -} - -/* - * CheckBox and Radio Widgets, - * and the CSS to embed a checkbox or radio icon inside a ToggleButton. - * - * Order of images in the default sprite (from L to R, checkbox and radio in same image): - * checkbox normal - checked - * - unchecked - * disabled - checked - * - unchecked - * hover - checked - * - unchecked - * - * radio normal - checked - * - unchecked - * disabled - checked - * - unchecked - * hover - checked - * - unchecked -*/ - -.tundra .dijitToggleButton .dijitCheckBox, -.tundra .dijitToggleButton .dijitRadio, -.tundra .dijitToggleButton .dijitCheckBoxIcon, -.tundra .dijitToggleButton .dijitRadioIcon { - background-image: url('images/checkmarkNoBorder.gif'); -} - -.tundra .dijitCheckBox, -.tundra .dijitRadio, -.tundra .dijitCheckBoxIcon, /* inside a toggle button */ -.tundra .dijitRadioIcon { /* inside a toggle button */ - background-image: url('images/checkmark.gif'); /* checkbox sprite image */ - background-repeat: no-repeat; - width: 16px; - height: 16px; - overflow: visible; - margin: 0; - padding: 0; -} - -.tundra .dijitCheckBox, -.tundra .dijitToggleButton .dijitCheckBoxIcon { - /* unchecked */ - background-position: -16px; -} - -.tundra .dijitCheckBoxChecked, -.tundra .dijitToggleButtonChecked .dijitCheckBoxIcon { - /* checked */ - background-position: 0px; -} - -.tundra .dijitCheckBoxDisabled { - /* disabled */ - background-position: -48px; -} - -.tundra .dijitCheckBoxCheckedDisabled { - /* disabled but checked */ - background-position: -32px; -} - -.tundra .dijitCheckBoxHover, -.tundra .dijitCheckBoxFocused { - /* hovering over an unchecked enabled checkbox */ - background-position: -80px; -} - -.tundra .dijitCheckBoxCheckedHover, - .tundra .dijitCheckBoxCheckedFocused { - /* hovering over a checked enabled checkbox */ - background-position: -64px; -} - -.tundra .dijitRadio, -.tundra .dijitToggleButton .dijitRadioIcon { - /* unselected */ - background-position: -112px; -} - -.tundra .dijitRadioChecked, -.tundra .dijitToggleButtonChecked .dijitRadioIcon { - /* selected */ - background-position: -96px; -} - -.tundra .dijitRadioCheckedDisabled { - /* selected but disabled */ - background-position: -128px; -} - -.tundra .dijitRadioDisabled { - /* unselected and disabled */ - background-position: -144px; -} - -.tundra .dijitRadioHover, -.tundra .dijitRadioFocused { - /* hovering over an unselected enabled radio button */ - background-position: -176px; -} - -.tundra .dijitRadioCheckedHover, -.tundra .dijitRadioCheckedFocused { - /* hovering over a selected enabled radio button */ - background-position: -160px; -} - -/* Menu */ -.tundra .dijitMenu { - border: 1px solid #9b9b9b; - margin: 0px; - padding: 0px; -} - -.tundra .dijitMenuItem { - background-color: #f7f7f7; - font: menu; - margin: 0; -} -.tundra .dijitMenuPreviousButton, .tundra .dijitMenuNextButton { - font-style: italic; -} -.tundra .dijitMenuItem TD { - padding:2px; -} - -.tundra .dijitMenuItemHover { - background-color: #808080; /* #95a0b0; #555555; #aaaaaa; #646464; #60a1ea; #848484; */ - color:#fff; -} - -.tundra .dijitMenuItemIcon { - width: 16px; - height: 16px; - /* padding-right: 3px; */ -} - -.tundra .dijitMenuExpand { - display:none; -} -.tundra .dijitMenuExpandEnabled { - /* margin-top:4px; */ - width:16px; - height:16px; - background:url('images/arrowRight.png') no-repeat center center; - display:block; -} -.dj_ie6 .tundra .dijitMenuExpandEnabled { - background-image:url('images/arrowRight.gif'); -} -.tundra .dijitMenuExpandInner { - display:none; -} - -.tundra .dijitMenuSeparator { - background-color: #f7f7f7; -} - -/* separator can be two pixels -- set border of either one to 0px to have only one */ -.tundra .dijitMenuSeparatorTop { - border-bottom: 1px solid #9b9b9b; /*97adcb; */ -} - -.tundra .dijitMenuSeparatorBottom { - border-top: 1px solid #e8e8e8; -} - -/* TitlePane */ - -.tundra .dijitTitlePane .dijitTitlePaneTitle { - background: #cccccc; - background:#fafafa url("images/titleBarBg.gif") repeat-x bottom left; - border:1px solid #bfbfbf; - padding:4px 4px 2px 4px; - cursor: pointer; -} -.dj_ie7 .dijitTitlePaneTextNode { - display:inline; -} - -/* TODO: merge these, and all other icons to a series of background-image:() and background-position: -16*n px styles */ -.tundra .dijitTitlePane .dijitArrowNode { - width:16px; - height:16px; - float:right; -} -.tundra .dijitTitlePane .dijitClosed .dijitArrowNode { - background:url('images/arrowRight.png') no-repeat center center; -} - -.tundra .dijitTitlePaneFocused .dijitTitlePaneTextNode { - text-decoration:underline; -} - -.dj_ie6 .tundra .dijitTitlePane .dijitClosed .dijitArrowNode { - background-image:url('images/arrowRight.gif'); -} -.tundra .dijitTitlePane .dijitOpen .dijitArrowNode { - background:url('images/arrowDown.png') no-repeat center center; -} -.dj_ie6 .tundra .dijitTitlePane .dijitOpen .dijitArrowNode { - background-image:url('images/arrowDown.gif'); -} -.tundra .dijitTitlePane .dijitArrowNodeInner { - visibility:hidden; -} -.dijit_a11y .dijitTitlePane .dijitArrowNodeInner { - visibility:visible; -} - -.tundra .dijitTitlePaneTitle .dijitOpenCloseArrowOuter { - margin-right:5px; -} - -.tundra .dijitOpen .dijitTitlePaneTitle .dijitOpenCloseArrowOuter { - position:relative; - top:2px; -} - -.tundra .dijitTitlePaneContentOuter { - background: #ffffff; - border:1px solid #bfbfbf; - border-top: 1px solid #cddde9; /* w/out this, an

                  on the top line causes a gap between the .content and .label */ -} -.tundra .dijitTitlePaneContentInner { - padding:10px; -} -/* force hasLayout to ensure borders etc, show up */ -.dj_ie6 .tundra .dijitTitlePaneContentOuter, -.dj_ie6 .tundra .dijitTitlePane .dijitTitlePaneTitle { - zoom: 1; -} -.tundra .dijitClickableRegion { - background-color : #ffc !important; -} - -/* Tabs */ - -.tundra .dijitTabPaneWrapper { - /* - overflow: hidden; - */ - background:#fff; - border:1px solid #ccc; -} - -.tundra .dijitTab { - line-height:normal; - margin-right:5px; /* space between one tab and the next in top/bottom mode */ - padding:0px; - border:1px solid #ccc; - background:#e2e2e2 url("images/tabEnabled.png") repeat-x; -} - -.tundra .dijitAlignLeft .dijitTab, -.tundra .dijitAlignRight .dijitTab { - margin-right:0px; - margin-bottom:5px; /* space between one tab and the next in left/right mode */ -} - -.tundra .dijitTabInnerDiv { - padding:6px 10px 4px 10px; - border-left:1px solid #fff; - border-bottom:1px solid #fff; -} - -.tundra .dijitTabHover, -.tundra .dijitTabCloseButtonHover { - color: #243C5F; - border-top-color:#92a0b3; - border-left-color:#92a0b3; - border-right-color:#92a0b3; - background:#e2e2e2 url("images/tabHover.png") repeat-x bottom; -} - -.dj_ie6 .tundra .dijitTabHover, -.dj_ie6 .tundra .dijitTabCloseButtonHover { - background-image: url("images/tabHover.gif"); -} - -.tundra .dijitTabChecked, -.tundra .dijitTabCloseButtonChecked -{ - /* the selected tab (with or without hover) */ - background-color:#fff; - border-color: #ccc; - background-image:none; -} - -/* make the active tab white on the side next to the content pane */ -.tundra .dijitAlignTop .dijitTabChecked, -.tundra .dijitAlignTop .dijitTabCloseButtonChecked -{ - border-bottom-color:white; - vertical-align:bottom; -} - -.tundra .dijitAlignBottom .dijitTabChecked, -.tundra .dijitAlignBottom .dijitTabCloseButtonChecked -{ - border-top-color:white; - -moz-border-radius:2px 2px 0px 0px; /* eliminate some border detritrus on moz */ -} - -.tundra .dijitAlignLeft .dijitTabChecked, -.tundra .dijitAlignLeft .dijitTabCloseButtonChecked -{ - border-right-color:white; -} - -.tundra .dijitAlignRight .dijitTabChecked, -.tundra .dijitAlignRight .dijitTabCloseButtonChecked -{ - border-left-color:white; -} - - -/* make space for a positioned close button */ -.tundra .dijitTab .dijitClosable { - position: relative; - padding:6px 20px 4px 10px; -} - -.tundra .dijitTab .dijitClosable .closeImage { - position:absolute; - top: 7px; - right: 3px; - height: 12px; - width: 12px; - padding: 0; - margin: 0; - background: url("images/tabClose.png") no-repeat right top; -} -.dj_ie6 .dijitTab .dijitClosable .closeImage { - background-image:url("images/tabClose.gif"); -} - -.tundra .dijitTabCloseButton .dijitClosable .closeImage { - background-image : url("images/tabClose.png"); -} -.dj_ie6 .tundra .dijitTabCloseButton .dijitClosable .closeImage { - background-image : url("images/tabClose.gif"); -} - -.tundra .dijitTabCloseButtonHover .dijitClosable .closeImage { - background-image : url("images/tabCloseHover.png"); -} -.dj_ie6 .tundra .dijitTabCloseButtonHover .dijitClosable .closeImage { - background-image : url("images/tabCloseHover.gif"); -} - -.tundra .dijitAlignLeft .dijitTab .dijitClosable { - padding:6px 10px 4px 20px; -} - -/* correct for IE6. - We cant force hasLayout as that blows out the shrink wrapped tabs - ..so we shim in the closeImage position properties instead -*/ -.dj_ie6 .tundra .dijitAlignLeft .dijitTab .dijitClosable .closeImage { - left:-20px; -} - -.tundra .dijitAlignBottom .dijitTab .dijitClosable .closeImage { - top: auto; - bottom: 7px; - right: 3px; -} - -.tundra .dijitAlignLeft .dijitTab .dijitClosable .closeImage { - top: 7px; - left: 3px; -} - -/* SplitContainer */ - -.tundra .dijitSplitContainerSizerH { - background:url("images/splitContainerSizerH.png") repeat-y #fff; - border:0; - border-left:1px solid #bfbfbf; - border-right:1px solid #bfbfbf; - width:7px; -} - -.tundra .dijitSplitContainerSizerH .thumb { - background:url("images/splitContainerSizerH-thumb.png") no-repeat #ccc; - left:1px; - width:3px; - height:19px; -} - -.tundra .dijitSplitContainerSizerV { - background:url("images/splitContainerSizerV.png") repeat-x #fff; - border:0; - border-top:1px solid #bfbfbf; - border-bottom:1px solid #bfbfbf; - height:7px; -} - -.tundra .dijitSplitContainerSizerV .thumb { - background:url("images/splitContainerSizerV-thumb.png") no-repeat #ccc; - top:1px; - width:19px; - height:3px; -} - - -/* Dialog */ - -.tundra .dijitDialog { - background: #eee; - border: 1px solid #999; - -webkit-box-shadow: 0px 5px 10px #adadad; -} - -.tundra .dijitDialog .dijitDialogTitle { - border-top: none; - border-left: none; - border-right: none; -} - -.tundra .dijitDialog .dijitDialogPaneContent { - background: #ffffff; - border:none; - border-top: 1px solid #ccc; /* #cddde9; /* w/out this, an

                  on the top line causes a gap between the .content and .label */ - padding:10px; - -} - -.tundra .dijitDialogTitleBar { - /* outer container for the titlebar of the dialog */ - background: #fafafa url("images/titleBarBg.gif") repeat-x bottom left; - /* border: 1px solid #bfbfbf; */ - padding: 4px 8px 2px 4px; - cursor: move; - outline:0; /* remove this line if keyboard focus on dialog startup is an issue. tab still takes you to first focusable element */ -} - -.tundra .dijitDialogTitle { - /* typography and styling of the dialog title */ - font-weight: bold; - padding: 8px 12px 8px 12px; - outline:0; -} - -.tundra .dijitDialogCloseIcon { - /* the default close icon for the dialog */ - background : url("images/tabClose.png") no-repeat right top; - float: right; - position: absolute; - vertical-align: middle; - right: 5px; - top: 5px; - height: 22px; - width: 22px; - cursor: pointer; -} -.dj_ie6 .tundra .dijitDialogCloseIcon { - background-image: url("images/tabClose.gif"); -} - -.tundra .dijitDialogContent { - /* the body of the dialog */ - padding: 8px; -} - -/*Tooltip*/ - -.tundra .dijitTooltip, -.tundra .dijitTooltipDialog { - /* the outermost dom node, holding the connector and container */ - opacity: 0.95; - background: transparent; /* make the area on the sides of the arrow transparent */ -} - -.dijitTooltipBelow { - /* leave room for arrow above content */ - padding-top: 13px; -} - -.dijitTooltipAbove { - /* leave room for arrow below content */ - padding-bottom: 13px; -} - -.tundra .dijitTooltipContainer { - /* - The part with the text. - - NOTE: - FF doesn't clip images used as CSS bgs if you specify a border - radius. If you use a solid color, it does. Webkit gets it right. - Sigh. - background: #ffffff url("images/popupMenuBg.gif") repeat-x bottom left; - */ - background-color: #fafafa; - border:1px solid #b6c7d5; - padding:0.45em; - border-radius: 6px; - -moz-border-radius: 7px; - -webkit-border-radius: 6px; -} - -.tundra .dijitTooltipConnector { - /* the arrow piece */ - border:0px; - z-index: 2; -} - -.tundra .dijitTooltipABRight .dijitTooltipConnector { - left: auto !important; - right: 3px; -} - -.tundra .dijitTooltipBelow .dijitTooltipConnector { - /* the arrow piece for tooltips below an element */ - top: 0px; - left: 3px; - background:url("images/tooltipConnectorUp.png") no-repeat top left; - width:16px; - height:14px; -} - -.dj_ie6 .tundra .dijitTooltipBelow .dijitTooltipConnector { - background-image: url("images/tooltipConnectorUp.gif"); -} - -.tundra .dijitTooltipAbove .dijitTooltipConnector { - /* the arrow piece for tooltips above an element */ - bottom: 0px; - left: 3px; - background:url("images/tooltipConnectorDown.png") no-repeat top left; - width:16px; - height:14px; -} -.dj_ie6 .tundra .dijitTooltipAbove .dijitTooltipConnector { - background-image: url("images/tooltipConnectorDown.gif"); -} - -.tundra .dijitTooltipLeft { - padding-right: 13px; -} -.dj_ie6 .tundra .dijitTooltipLeft { - padding-right: 15px; -} -.tundra .dijitTooltipLeft .dijitTooltipConnector { - /* the arrow piece for tooltips to the left of an element, bottom borders aligned */ - right: 0px; - bottom: 7px; - background:url("images/tooltipConnectorRight.png") no-repeat top left; - width:16px; - height:14px; -} -.dj_ie6 .tundra .dijitTooltipLeft .dijitTooltipConnector { - background-image: url("images/tooltipConnectorRight.gif"); -} - -.tundra .dijitTooltipRight { - padding-left: 13px; -} -.tundra .dijitTooltipRight .dijitTooltipConnector { - /* the arrow piece for tooltips to the right of an element, bottom borders aligned */ - left: 0px; - bottom: 7px; - background:url("images/tooltipConnectorLeft.png") no-repeat top left; - width:16px; - height:14px; -} -.dj_ie6 .tundra .dijitTooltipRight .dijitTooltipConnector { - background-image: url("images/tooltipConnectorLeft.gif"); -} - -/* Accordion */ - -.tundra .dijitAccordionPane-selected { - /* background-color:#85aeec; */ - background-color: #e7e7e7; -} - -.tundra .dijitAccordionPane .dijitAccordionTitle { - background:#fafafa url("images/titleBar.png") repeat-x bottom left; - border-top: 1px solid #bfbfbf; - padding:4px 4px 2px 4px; -} - -.tundra .dijitAccordionPane-selected .dijitAccordionTitle { - background: #ededed url("images/buttonActive.png") bottom repeat-x; - font-weight: bold; - border-top: 1px solid #aaaaaa; - padding: 4px 4px 2px 4px; -} -.tundra .dijitAccordionPaneFocused .dijitAccordionText { - text-decoration:underline !important; - /*border-left:1px solid #999; - border-right:1px solid #999; - border-top:1px solid #999; */ -} - -.tundra .dijitAccordionPane .dijitAccordionArrow { - background:url("images/arrowUp.png") no-repeat; - width:15px; - height:15px; - margin-top:2px; -} -.dj_ie6 .tundra .dijitAccordionPane .dijitAccordionArrow { - background-image: url("images/arrowUp.gif"); -} - -.tundra .dijitAccordionPane-selected .dijitAccordionArrow { - background:url("images/circleIcon.png") no-repeat; - margin-top:2px; -} -.dj_ie6 .tundra .dijitAccordionPane-selected .dijitAccordionArrow { - background-image: url("images/circleIcon.gif"); -} - -.tundra .dijitAccordionPane .dijitAccordionBody { - background: #fff; - border-top: 1px solid #bfbfbf; -} - -/* Tree */ - -.tundra .dijitTreeNode { - background-image : url('images/i.gif'); - background-position : top left; - background-repeat : repeat-y; - margin-left: 19px; - zoom: 1; /* MOW: what the heck is this doing in here? */ -} - -/* left vertical line (grid) for all nodes */ -.tundra .dijitTreeIsLast { - background: url('images/i_half.gif') no-repeat; -} - -.tundra .dijitTreeIsRoot { - margin-left: 0; - background-image: none; -} - -.tundra .dijitTreeExpando { - width: 18px; - height: 18px; -} - -.tundra .dijitTreeContent { - min-height: 18px; - min-width: 18px; - margin-left:18px; - padding-top:3px; - padding-left:1px; -} - - -.tundra .dijitTreeExpand { - width: 18px; - height: 18px; - background-repeat : no-repeat; -} - -/* same style as IE selection */ -.tundra .dijitTreeNodeEmphasized { - background-color: Highlight; - color: HighlightText; -} - -/* don't use :focus due to opera and IE's lack of support on div's */ -.tundra .dijitTreeLabelFocused { - outline: 1px invert dotted; -} - -.tundra .dijitTreeExpandoOpened { - background-image: url('images/treeExpand_minus.gif'); -} - -.tundra .dijitTreeExpandoClosed { - background-image: url('images/treeExpand_plus.gif'); -} - -.tundra .dijitTreeExpandoLeaf { - background-image: url('images/treeExpand_leaf.gif'); -} - -.tundra .dijitTreeExpandoLoading { - background-image: url('images/treeExpand_loading.gif'); -} - - -/* Calendar*/ - -.tundra .dijitCalendarIncrementControl { - /* next/prev month buttons */ - width:16px; - height:16px; -} -.dj_ie6 .tundra .dijitCalendarIncrementControl { - padding:.1em; -} - -.tundra .dijitCalendarIncreaseInner, -.tundra .dijitCalendarDecreaseInner { - visibility:hidden; -} - -.tundra .dijitCalendarDecrease { - background:url("images/arrowLeft.png") no-repeat center center; -} -.dj_ie6 .tundra .dijitCalendarDecrease { - background-image:url("images/arrowLeft.gif"); -} - -.tundra .dijitCalendarIncrease { - background:url(images/arrowRight.png) no-repeat center center; -} -.dj_ie6 .tundra .dijitCalendarIncrease { - background-image:url("images/arrowRight.gif"); -} - -.tundra table.dijitCalendarContainer { - font-size: 100%; - border-collapse: collapse; - border-spacing: 0; - border: 1px solid #ccc; - margin: 0; -} - -.tundra .dijitCalendarMonthContainer th { - /* month header cell */ - background:white url("images/calendarMonthLabel.png") repeat-x top; - padding-top:.3em; - padding-bottom:.1em; - text-align:center; -} -.dj_ie6 .tundra .dijitCalendarMonthContainer th { - padding-top:.1em; - padding-bottom:0em; -} - -.tundra .dijitCalendarDayLabelTemplate { - /* day of week labels */ - background:white url("images/calendarDayLabel.png") repeat-x bottom; - font-weight:normal; - padding-top:.15em; - padding-bottom:0em; - border-top: 1px solid #eeeeee; - color:#293a4b; - text-align:center; -} - -.tundra .dijitCalendarMonthLabel { - /* day of week labels */ - color:#293a4b; - font-size: 0.75em; - font-weight: bold; - text-align:center; -} - -.dj_ie7 .tundra .dijitCalendarDateTemplate, -.dj_ie6 .tundra .dijitCalendarDateTemplate { - font-size: 0.8em; -} - -.tundra .dijitCalendarDateTemplate { - /* style for each day cell */ - font-size: 0.9em; - font-weight: bold; - text-align: center; - padding: 0.3em 0.3em 0.05em 0.3em; - letter-spacing: 1px; -} - - -.tundra .dijitCalendarPreviousMonth, -.tundra .dijitCalendarNextMonth { - /* days that are part of the previous or next month */ - color:#999999; - background-color:#f8f8f8 !important; -} - -.tundra .dijitCalendarPreviousMonthDisabled, -.tundra .dijitCalendarNextMonthDisabled { - /* days that are part of the previous or next month - disabled*/ - background-color:#a4a5a6 !important; -} - -.tundra .dijitCalendarCurrentMonth { - /* days that are part of this month */ - background-color:white !important; -} - -.tundra .dijitCalendarCurrentMonthDisabled { - /* days that are part of this month - disabled */ - background-color:#bbbbbc !important; -} - -.tundra .dijitCalendarDisabledDate { - /* one or the other? */ - /* background: url(images/noX.gif) no-repeat center center !important; */ - text-decoration:line-through !important; - cursor:default !important; -} - -.tundra .dijitCalendarCurrentDate { - /* cell for today's date */ - text-decoration:underline; - font-weight:bold; -} - -.tundra .dijitCalendarSelectedDate { - /* cell for the selected date */ - background-color:#bbc4d0 !important; - color:black !important; -} - - -.tundra .dijitCalendarYearContainer { - /* footer of the table that contains the year display/selector */ - background:white url("images/calendarYearLabel.png") repeat-x bottom; - border-top:1px solid #ccc; -} - -.tundra .dijitCalendarYearLabel { - /* container for all of 3 year labels */ - margin:0; - padding:0.4em 0 0.25em 0; - text-align:center; -} - -.tundra .dijitCalendarSelectedYear { - /* label for selected year */ - color:black; - padding:0.2em; - padding-bottom:0.1em; - background-color:#bbc4d0 !important; -} - -.tundra .dijitCalendarNextYear, -.tundra .dijitCalendarPreviousYear { - /* label for next/prev years */ - color:black !important; - font-weight:normal; -} - - - -/* inline edit boxen */ -.tundra .dijitInlineValue { - /* span around an inline-editable value when NOT in edit mode */ - padding:3px; - margin:4px; -} - - -/* MOW: trying to get this to look like a mini-dialog. Advised? */ -.tundra .dijitInlineEditor { - /* fieldset surrounding an inlineEditor in edit mode */ - display: inline-block; - display: -moz-inline-stack; - #display:inline; - /* - border: solid; - border-color: #7788a0 #344257 #344257 #7788a0; - border-width:1px 2px 2px 1px; - -moz-border-radius:0px 2px 0px 2px; make BL and TR corners indent on Moz so it looks like we have a shadow - background-color:white; - */ -} - -.dijitInlineEditor .saveButton, -.dijitInlineEditor .cancelButton { - margin:3px 3px 3px 0px; -} - - -/* spinner */ - -.tundra .dijitSpinner {} -.tundra .dijitSpinner input { -} - - - - -/**** - dijit.ProgressBar - ****/ - -.tundra .dijitProgressBar { - margin:2px 0px 2px 0px; -} - -.tundra .dijitProgressBarEmpty{ - /* outer container and background of the bar that's not finished yet*/ - background:#ececec url("images/progressBarEmpty.png") repeat-x bottom left; - border-color: #84a3d1; -} - -.tundra .dijitProgressBarTile{ - /* inner container for finished portion when in 'tile' (image) mode */ - background:#cad2de url("images/progressBarFull.png") repeat-x top left; -} - -.tundra .dijitProgressBarLabel { - /* Set to a color that contrasts with both the "Empty" and "Full" parts. */ - color:#293a4b; -} - -.tundra .dijitProgressBarIndeterminate .dijitProgressBarTile { - /* use an animated gif for the progress bar in 'indeterminate' mode */ - background:#cad2de url("images/dijitProgressBarAnim.gif") repeat-x top left; -} - -/**** - SLIDER -****/ - -.tundra .dijitHorizontalSliderProgressBar { - border-color: #aab0bb; - background: #c0c2c5 url("images/sliderFull.png") repeat-x top left; -} - -.tundra .dijitVerticalSliderProgressBar { - border-color: #aab0bb; - background: #c0c2c5 url("images/sliderFullVertical.png") repeat-y bottom left; -} - -.tundra .dijitSliderFocused .dijitHorizontalSliderProgressBar, -.tundra .dijitSliderFocused .dijitHorizontalSliderLeftBumper { - background-image:url("images/sliderFullFocus.png"); -} - -.tundra .dijitSliderFocused .dijitVerticalSliderProgressBar, -.tundra .dijitSliderFocused .dijitVerticalSliderBottomBumper { - background-image:url("images/sliderFullVerticalFocus.png"); -} - -.tundra .dijitVerticalSliderRemainingBar { - border-color: #b4b4b4; - background: #dcdcdc url("images/sliderEmptyVertical.png") repeat-y bottom left; -} - -.tundra .dijitHorizontalSliderRemainingBar { - border-color: #b4b4b4; - background: #dcdcdc url("images/sliderEmpty.png") repeat-x top left; -} - -.tundra .dijitSliderBar { - border-style: solid; - outline:1px; - /* border-color: #b4b4b4; */ -} -.tundra .dijitSliderFocused .dijitSliderBar { - border-color:#333; -} - -.dijit_a11y .dijitSliderProgressBar { - background-color:#333 !important; -} - -.tundra .dijitHorizontalSliderImageHandle { - border:0px; - width:16px; - height:16px; - background:url("images/preciseSliderThumb.png") no-repeat center top; - cursor:pointer; -} -.tundra .dijitSliderFocused .dijitHorizontalSliderImageHandle { - background-image:url("images/preciseSliderThumbFocus.png"); - #background-image:url("images/preciseSliderThumbFocus.gif"); -} - -.dj_ie6 .tundra .dijitHorizontalSliderImageHandle { - background-image:url("images/preciseSliderThumb.gif"); -} - -.tundra .dijitHorizontalSliderLeftBumper { - border-left-width: 1px; - border-color: #aab0bb; - background: #c0c2c5 url("images/sliderFull.png") repeat-x top left; -} - -.tundra .dijitHorizontalSliderRightBumper { - background: #dcdcdc url("images/sliderEmpty.png") repeat-x top left; - border-color: #b4b4b4; - border-right-width: 1px; -} - -.tundra .dijitVerticalSliderImageHandle { - border:0px; - width:16px; - height:16px; - background:url("images/sliderThumb.png") no-repeat center center; - cursor:pointer; -} - -.tundra .dijitSliderFocused .dijitVerticalSliderImageHandle { - background-image:url("images/sliderThumbFocus.png"); -} -.dj_ie6 .tundra .dijitSliderFocused .dijitVerticalSliderImageHandle { - background-image:url("images/sliderThumbFocus.gif"); -} - -.tundra .dijitVerticalSliderBottomBumper { - border-bottom-width: 1px; - border-color: #aab0bb; - background: #c0c2c5 url("images/sliderFullVertical.png") repeat-y bottom left; -} - -.tundra .dijitVerticalSliderTopBumper { - background: #dcdcdc url("images/sliderEmptyVertical.png") repeat-y top left; - border-color: #b4b4b4; - border-top-width: 1px; -} - -.tundra .dijitHorizontalSliderIncrementIcon, -.tundra .dijitVerticalSliderIncrementIcon { - background:url('images/arrowUp.png') no-repeat center center; - width:16px; height:16px; - cursor:pointer; -} -.tundra .dijitHorizontalSliderIncrementIcon { - background-image:url('images/arrowRight.png'); -} - -.tundra .dijitHorizontalSliderDecrementIcon, -.tundra .dijitVerticalSliderDecrementIcon { - width:16px; - height:16px; - cursor:pointer; - background:url('images/arrowDown.png') no-repeat center center; -} -.tundra .dijitHorizontalSliderDecrementIcon { background-image:url('images/arrowLeft.png'); } - -.tundra .dijitSliderButtonInner { - visibility:hidden; -} - -.tundra .dijitSliderDisabled { - opacity:0.6 !important; -} - -.dj_ie6 .tundra .dijitSliderDisabled, -.dj_ie6 .tundra .dijitSliderDisabled .RuleContainer, -.dj_ie6 .tundra .dijitSliderDisabled .dijitSliderRemainingBar, -.dj_ie6 .tundra .dijitSliderDisabled .dijitSliderProgressBar { - filter: gray() alpha(opacity=40); -} - -/**** ICONS *****/ - -.tundra .dijitEditorIcon { - background-image: url('images/editor.gif'); /* editor icons sprite image */ - background-repeat: no-repeat; - width: 18px; - height: 18px; - text-align: center; -} -.tundra .dijitEditorIconSep { background-position: 0px; } -.tundra .dijitEditorIconBackColor { background-position: -18px; } -.tundra .dijitEditorIconBold { background-position: -36px; } -.tundra .dijitEditorIconCancel { background-position: -54px; } -.tundra .dijitEditorIconCopy { background-position: -72px; } -.tundra .dijitEditorIconCreateLink { background-position: -90px; } -.tundra .dijitEditorIconCut { background-position: -108px; } -.tundra .dijitEditorIconDelete { background-position: -126px; } -.tundra .dijitEditorIconForeColor { background-position: -144px; } -.tundra .dijitEditorIconHiliteColor { background-position: -162px; } -.tundra .dijitEditorIconIndent { background-position: -180px; } -.tundra .dijitEditorIconInsertHorizontalRule { background-position: -198px; } -.tundra .dijitEditorIconInsertImage { background-position: -216px; } -.tundra .dijitEditorIconInsertOrderedList { background-position: -234px; } -.tundra .dijitEditorIconInsertTable { background-position: -252px; } -.tundra .dijitEditorIconInsertUnorderedList { background-position: -270px; } -.tundra .dijitEditorIconItalic { background-position: -288px; } -.tundra .dijitEditorIconJustifyCenter { background-position: -306px; } -.tundra .dijitEditorIconJustifyFull { background-position: -324px; } -.tundra .dijitEditorIconJustifyLeft { background-position: -342px; } -.tundra .dijitEditorIconJustifyRight { background-position: -360px; } -.tundra .dijitEditorIconLeftToRight { background-position: -378px; } -.tundra .dijitEditorIconListBulletIndent { background-position: -396px; } -.tundra .dijitEditorIconListBulletOutdent { background-position: -414px; } -.tundra .dijitEditorIconListNumIndent { background-position: -432px; } -.tundra .dijitEditorIconListNumOutdent { background-position: -450px; } -.tundra .dijitEditorIconOutdent { background-position: -468px; } -.tundra .dijitEditorIconPaste { background-position: -486px; } -.tundra .dijitEditorIconRedo { background-position: -504px; } -.tundra .dijitEditorIconRemoveFormat { background-position: -522px; } -.tundra .dijitEditorIconRightToLeft { background-position: -540px; } -.tundra .dijitEditorIconSave { background-position: -558px; } -.tundra .dijitEditorIconSpace { background-position: -576px; } -.tundra .dijitEditorIconStrikethrough { background-position: -594px; } -.tundra .dijitEditorIconSubscript { background-position: -612px; } -.tundra .dijitEditorIconSuperscript { background-position: -630px; } -.tundra .dijitEditorIconUnderline { background-position: -648px; } -.tundra .dijitEditorIconUndo { background-position: -666px; } -.tundra .dijitEditorIconWikiword { background-position: -684px; } - -/* - * IE6: can't display PNG images with gradient transparency. - * Want to use filter property for those images, but then need to specify a path relative - * to the main page, rather than relative to this file... using gifs for now - */ - -.dj_ie6 .tundra .dijitInputField -{ - background: url("images/validationInputBg.gif") repeat-x top left #fff; -} - -/**** Disabled cursor *****/ -.tundra .dijitSliderDisabled *, -.tundra .dijitDisabledClickableRegion, /* a region the user would be able to click on, but it's disabled */ -.tundra .dijitSpinnerDisabled *, -.tundra .dijitButtonDisabled *, -.tundra .dijitDropDownButtonDisabled *, -.tundra .dijitComboButtonDisabled *, -.tundra .dijitComboBoxDisabled * -{ - cursor: not-allowed !important; -} - -/* DnD avatar-specific settings */ -/* For now it uses a default set of rules. Some other DnD classes can be modified as well. */ -.tundra .dojoDndAvatar {font-size: 75%; color: black;} -.tundra .dojoDndAvatarHeader td {padding-left: 20px; padding-right: 4px;} -.tundra .dojoDndAvatarHeader {background: #ccc;} -.tundra .dojoDndAvatarItem {background: #eee;} -.tundra.dojoDndMove .dojoDndAvatarHeader {background-image: url(images/dndNoMove.png); background-repeat: no-repeat;} -.tundra.dojoDndCopy .dojoDndAvatarHeader {background-image: url(images/dndNoCopy.png); background-repeat: no-repeat;} -.tundra.dojoDndMove .dojoDndAvatarCanDrop .dojoDndAvatarHeader {background-image: url(images/dndMove.png); background-repeat: no-repeat;} -.tundra.dojoDndCopy .dojoDndAvatarCanDrop .dojoDndAvatarHeader {background-image: url(images/dndCopy.png); background-repeat: no-repeat;} - -.tundra .dijitContentPaneLoading { - background:url('images/loading.gif') no-repeat left center; - padding-left:25px; -} - -.tundra .dijitContentPaneError { - background:url('images/warning.png') no-repeat left center; - padding-left:25px; -} +@import url("Common.css"); + +@import url("layout/ContentPane.css"); +@import url("layout/TabContainer.css"); +@import url("layout/AccordionContainer.css"); +@import url("layout/SplitContainer.css"); +@import url("layout/BorderContainer.css"); +@import url("form/Common.css"); +@import url("form/Button.css"); +@import url("form/Checkbox.css"); +@import url("form/RadioButton.css"); +@import url("form/Slider.css"); +@import url("Tree.css"); +@import url("ProgressBar.css"); +@import url("TitlePane.css"); +@import url("Calendar.css"); +@import url("TimePicker.css"); +@import url("Toolbar.css"); +@import url("Dialog.css"); +@import url("Menu.css"); +@import url("Editor.css"); +@import url("ColorPalette.css"); + +/* RTL files */ +@import url("../dijit_rtl.css"); +@import url("Calendar_rtl.css"); +@import url("Dialog_rtl.css"); +@import url("Editor_rtl.css"); +@import url("Menu_rtl.css"); +@import url("Tree_rtl.css"); +@import url("TitlePane_rtl.css"); +@import url("layout/TabContainer_rtl.css"); +@import url("form/Slider_rtl.css"); diff --git a/spring-js/src/main/resources/META-INF/dojo/AdapterRegistry.js b/spring-js/src/main/resources/META-INF/dojo/AdapterRegistry.js index 4d9907c5..610bd0e7 100644 --- a/spring-js/src/main/resources/META-INF/dojo/AdapterRegistry.js +++ b/spring-js/src/main/resources/META-INF/dojo/AdapterRegistry.js @@ -1,11 +1,7 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ diff --git a/spring-js/src/main/resources/META-INF/dojo/DeferredList.js b/spring-js/src/main/resources/META-INF/dojo/DeferredList.js index 5149770d..8e027ae3 100644 --- a/spring-js/src/main/resources/META-INF/dojo/DeferredList.js +++ b/spring-js/src/main/resources/META-INF/dojo/DeferredList.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo.DeferredList"]){dojo._hasResource["dojo.DeferredList"]=true;dojo.provide("dojo.DeferredList");dojo.declare("dojo.DeferredList",dojo.Deferred,{constructor:function(_1,_2,_3,_4,_5){this.list=_1;this.resultList=new Array(this.list.length);this.chain=[];this.id=this._nextId();this.fired=-1;this.paused=0;this.results=[null,null];this.canceller=_5;this.silentlyCancelled=false;if(this.list.length===0&&!_2){this.callback(this.resultList);}this.finishedCount=0;this.fireOnOneCallback=_2;this.fireOnOneErrback=_3;this.consumeErrors=_4;var _6=0;dojo.forEach(this.list,function(d,_8){d.addCallback(this,function(r){this._cbDeferred(_8,true,r);return r;});d.addErrback(this,function(r){this._cbDeferred(_8,false,r);return r;});_8++;},this);},_cbDeferred:function(_b,_c,_d){this.resultList[_b]=[_c,_d];this.finishedCount+=1;if(this.fired!==0){if(_c&&this.fireOnOneCallback){this.callback([_b,_d]);}else{if(!_c&&this.fireOnOneErrback){this.errback(_d);}else{if(this.finishedCount==this.list.length){this.callback(this.resultList);}}}}if(!_c&&this.consumeErrors){_d=null;}return _d;},gatherResults:function(_e){var d=new dojo.DeferedList(_e,false,true,false);d.addCallback(function(_10){var ret=[];for(var i=0;i<_10.length;i++){ret.push(_10[i][1]);}return ret;});return d;}});} \ No newline at end of file +if(!dojo._hasResource["dojo.DeferredList"]){dojo._hasResource["dojo.DeferredList"]=true;dojo.provide("dojo.DeferredList");dojo.declare("dojo.DeferredList",dojo.Deferred,{constructor:function(_1,_2,_3,_4,_5){this.list=_1;this.resultList=new Array(this.list.length);this.chain=[];this.id=this._nextId();this.fired=-1;this.paused=0;this.results=[null,null];this.canceller=_5;this.silentlyCancelled=false;if(this.list.length===0&&!_2){this.callback(this.resultList);}this.finishedCount=0;this.fireOnOneCallback=_2;this.fireOnOneErrback=_3;this.consumeErrors=_4;dojo.forEach(this.list,function(d,_7){d.addCallback(this,function(r){this._cbDeferred(_7,true,r);return r;});d.addErrback(this,function(r){this._cbDeferred(_7,false,r);return r;});},this);},_cbDeferred:function(_a,_b,_c){this.resultList[_a]=[_b,_c];this.finishedCount+=1;if(this.fired!==0){if(_b&&this.fireOnOneCallback){this.callback([_a,_c]);}else{if(!_b&&this.fireOnOneErrback){this.errback(_c);}else{if(this.finishedCount==this.list.length){this.callback(this.resultList);}}}}if(!_b&&this.consumeErrors){_c=null;}return _c;},gatherResults:function(_d){var d=new dojo.DeferredList(_d,false,true,false);d.addCallback(function(_f){var ret=[];dojo.forEach(_f,function(_11){ret.push(_11[1]);});return ret;});return d;}});} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/LICENSE b/spring-js/src/main/resources/META-INF/dojo/LICENSE index 2709e72e..3fa27203 100644 --- a/spring-js/src/main/resources/META-INF/dojo/LICENSE +++ b/spring-js/src/main/resources/META-INF/dojo/LICENSE @@ -1,4 +1,4 @@ -Dojo is availble under *either* the terms of the modified BSD license *or* the +Dojo is available under *either* the terms of the modified BSD license *or* the Academic Free License version 2.1. As a recipient of Dojo, you may choose which license to receive this code under (except as noted in per-module LICENSE files). Some modules may not be the copyright of the Dojo Foundation. These @@ -13,7 +13,7 @@ The text of the AFL and BSD licenses is reproduced below. The "New" BSD License: ********************** -Copyright (c) 2005-2007, The Dojo Foundation +Copyright (c) 2005-2008, The Dojo Foundation All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/spring-js/src/main/resources/META-INF/dojo/NodeList-fx.js b/spring-js/src/main/resources/META-INF/dojo/NodeList-fx.js index 430afc38..f6667edd 100644 --- a/spring-js/src/main/resources/META-INF/dojo/NodeList-fx.js +++ b/spring-js/src/main/resources/META-INF/dojo/NodeList-fx.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo.NodeList-fx"]){dojo._hasResource["dojo.NodeList-fx"]=true;dojo.provide("dojo.NodeList-fx");dojo.require("dojo.fx");dojo.extend(dojo.NodeList,{_anim:function(_1,_2,_3){var _4=[];_3=_3||{};this.forEach(function(_5){var _6={node:_5};dojo.mixin(_6,_3);_4.push(_1[_2](_6));});return dojo.fx.combine(_4);},wipeIn:function(_7){return this._anim(dojo.fx,"wipeIn",_7);},wipeOut:function(_8){return this._anim(dojo.fx,"wipeOut",_8);},slideTo:function(_9){return this._anim(dojo.fx,"slideTo",_9);},fadeIn:function(_a){return this._anim(dojo,"fadeIn",_a);},fadeOut:function(_b){return this._anim(dojo,"fadeOut",_b);},animateProperty:function(_c){return this._anim(dojo,"animateProperty",_c);}});} \ No newline at end of file +if(!dojo._hasResource["dojo.NodeList-fx"]){dojo._hasResource["dojo.NodeList-fx"]=true;dojo.provide("dojo.NodeList-fx");dojo.require("dojo.fx");dojo.extend(dojo.NodeList,{_anim:function(_1,_2,_3){_3=_3||{};return dojo.fx.combine(this.map(function(_4){var _5={node:_4};dojo.mixin(_5,_3);return _1[_2](_5);}));},wipeIn:function(_6){return this._anim(dojo.fx,"wipeIn",_6);},wipeOut:function(_7){return this._anim(dojo.fx,"wipeOut",_7);},slideTo:function(_8){return this._anim(dojo.fx,"slideTo",_8);},fadeIn:function(_9){return this._anim(dojo,"fadeIn",_9);},fadeOut:function(_a){return this._anim(dojo,"fadeOut",_a);},animateProperty:function(_b){return this._anim(dojo,"animateProperty",_b);},anim:function(_c,_d,_e,_f,_10){var _11=dojo.fx.combine(this.map(function(_12){return dojo.animateProperty({node:_12,properties:_c,duration:_d||350,easing:_e});}));if(_f){dojo.connect(_11,"onEnd",_f);}return _11.play(_10||0);}});} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/NodeList-html.js b/spring-js/src/main/resources/META-INF/dojo/NodeList-html.js new file mode 100644 index 00000000..ce14b0b6 --- /dev/null +++ b/spring-js/src/main/resources/META-INF/dojo/NodeList-html.js @@ -0,0 +1,8 @@ +/* + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details +*/ + + +if(!dojo._hasResource["dojo.NodeList-html"]){dojo._hasResource["dojo.NodeList-html"]=true;dojo.provide("dojo.NodeList-html");dojo.require("dojo.html");dojo.extend(dojo.NodeList,{html:function(_1,_2){var _3=new dojo.html._ContentSetter(_2||{});this.forEach(function(_4){_3.node=_4;_3.set(_1);_3.tearDown();});return this;}});} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/OpenAjax.js b/spring-js/src/main/resources/META-INF/dojo/OpenAjax.js index 79c082cc..739d539d 100644 --- a/spring-js/src/main/resources/META-INF/dojo/OpenAjax.js +++ b/spring-js/src/main/resources/META-INF/dojo/OpenAjax.js @@ -1,11 +1,7 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ diff --git a/spring-js/src/main/resources/META-INF/dojo/_base.js b/spring-js/src/main/resources/META-INF/dojo/_base.js index 1e17e70f..cf16774c 100644 --- a/spring-js/src/main/resources/META-INF/dojo/_base.js +++ b/spring-js/src/main/resources/META-INF/dojo/_base.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo._base"]){dojo._hasResource["dojo._base"]=true;dojo.provide("dojo._base");dojo.require("dojo._base.lang");dojo.require("dojo._base.declare");dojo.require("dojo._base.connect");dojo.require("dojo._base.Deferred");dojo.require("dojo._base.json");dojo.require("dojo._base.array");dojo.require("dojo._base.Color");dojo.requireIf(dojo.isBrowser,"dojo._base.window");dojo.requireIf(dojo.isBrowser,"dojo._base.event");dojo.requireIf(dojo.isBrowser,"dojo._base.html");dojo.requireIf(dojo.isBrowser,"dojo._base.NodeList");dojo.requireIf(dojo.isBrowser,"dojo._base.query");dojo.requireIf(dojo.isBrowser,"dojo._base.xhr");dojo.requireIf(dojo.isBrowser,"dojo._base.fx");(function(){if(djConfig.require){for(var x=0;x= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ diff --git a/spring-js/src/main/resources/META-INF/dojo/_base/Deferred.js b/spring-js/src/main/resources/META-INF/dojo/_base/Deferred.js index 08d96d45..816f2f06 100644 --- a/spring-js/src/main/resources/META-INF/dojo/_base/Deferred.js +++ b/spring-js/src/main/resources/META-INF/dojo/_base/Deferred.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo._base.Deferred"]){dojo._hasResource["dojo._base.Deferred"]=true;dojo.provide("dojo._base.Deferred");dojo.require("dojo._base.lang");dojo.Deferred=function(_1){this.chain=[];this.id=this._nextId();this.fired=-1;this.paused=0;this.results=[null,null];this.canceller=_1;this.silentlyCancelled=false;};dojo.extend(dojo.Deferred,{_nextId:(function(){var n=1;return function(){return n++;};})(),cancel:function(){var _3;if(this.fired==-1){if(this.canceller){_3=this.canceller(this);}else{this.silentlyCancelled=true;}if(this.fired==-1){if(!(_3 instanceof Error)){var _4=_3;_3=new Error("Deferred Cancelled");_3.dojoType="cancel";_3.cancelResult=_4;}this.errback(_3);}}else{if((this.fired==0)&&(this.results[0] instanceof dojo.Deferred)){this.results[0].cancel();}}},_resback:function(_5){this.fired=((_5 instanceof Error)?1:0);this.results[this.fired]=_5;this._fire();},_check:function(){if(this.fired!=-1){if(!this.silentlyCancelled){throw new Error("already called!");}this.silentlyCancelled=false;return;}},callback:function(_6){this._check();this._resback(_6);},errback:function(_7){this._check();if(!(_7 instanceof Error)){_7=new Error(_7);}this._resback(_7);},addBoth:function(cb,_9){var _a=dojo.hitch(cb,_9);if(arguments.length>2){_a=dojo.partial(_a,arguments,2);}return this.addCallbacks(_a,_a);},addCallback:function(cb,_c){var _d=dojo.hitch(cb,_c);if(arguments.length>2){_d=dojo.partial(_d,arguments,2);}return this.addCallbacks(_d,null);},addErrback:function(cb,_f){var _10=dojo.hitch(cb,_f);if(arguments.length>2){_10=dojo.partial(_10,arguments,2);}return this.addCallbacks(null,_10);},addCallbacks:function(cb,eb){this.chain.push([cb,eb]);if(this.fired>=0){this._fire();}return this;},_fire:function(){var _13=this.chain;var _14=this.fired;var res=this.results[_14];var _16=this;var cb=null;while((_13.length>0)&&(this.paused==0)){var f=_13.shift()[_14];if(!f){continue;}try{res=f(res);_14=((res instanceof Error)?1:0);if(res instanceof dojo.Deferred){cb=function(res){_16._resback(res);_16.paused--;if((_16.paused==0)&&(_16.fired>=0)){_16._fire();}};this.paused++;}}catch(err){console.debug(err);_14=1;res=err;}}this.fired=_14;this.results[_14]=res;if((cb)&&(this.paused)){res.addBoth(cb);}}});} \ No newline at end of file +if(!dojo._hasResource["dojo._base.Deferred"]){dojo._hasResource["dojo._base.Deferred"]=true;dojo.provide("dojo._base.Deferred");dojo.require("dojo._base.lang");dojo.Deferred=function(_1){this.chain=[];this.id=this._nextId();this.fired=-1;this.paused=0;this.results=[null,null];this.canceller=_1;this.silentlyCancelled=false;};dojo.extend(dojo.Deferred,{_nextId:(function(){var n=1;return function(){return n++;};})(),cancel:function(){var _3;if(this.fired==-1){if(this.canceller){_3=this.canceller(this);}else{this.silentlyCancelled=true;}if(this.fired==-1){if(!(_3 instanceof Error)){var _4=_3;_3=new Error("Deferred Cancelled");_3.dojoType="cancel";_3.cancelResult=_4;}this.errback(_3);}}else{if((this.fired==0)&&(this.results[0] instanceof dojo.Deferred)){this.results[0].cancel();}}},_resback:function(_5){this.fired=((_5 instanceof Error)?1:0);this.results[this.fired]=_5;this._fire();},_check:function(){if(this.fired!=-1){if(!this.silentlyCancelled){throw new Error("already called!");}this.silentlyCancelled=false;return;}},callback:function(_6){this._check();this._resback(_6);},errback:function(_7){this._check();if(!(_7 instanceof Error)){_7=new Error(_7);}this._resback(_7);},addBoth:function(cb,_9){var _a=dojo.hitch.apply(dojo,arguments);return this.addCallbacks(_a,_a);},addCallback:function(cb,_c){return this.addCallbacks(dojo.hitch.apply(dojo,arguments));},addErrback:function(cb,_e){return this.addCallbacks(null,dojo.hitch.apply(dojo,arguments));},addCallbacks:function(cb,eb){this.chain.push([cb,eb]);if(this.fired>=0){this._fire();}return this;},_fire:function(){var _11=this.chain;var _12=this.fired;var res=this.results[_12];var _14=this;var cb=null;while((_11.length>0)&&(this.paused==0)){var f=_11.shift()[_12];if(!f){continue;}var _17=function(){var ret=f(res);if(typeof ret!="undefined"){res=ret;}_12=((res instanceof Error)?1:0);if(res instanceof dojo.Deferred){cb=function(res){_14._resback(res);_14.paused--;if((_14.paused==0)&&(_14.fired>=0)){_14._fire();}};this.paused++;}};if(dojo.config.isDebug){_17.call(this);}else{try{_17.call(this);}catch(err){_12=1;res=err;}}}this.fired=_12;this.results[_12]=res;if((cb)&&(this.paused)){res.addBoth(cb);}}});} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/_base/NodeList.js b/spring-js/src/main/resources/META-INF/dojo/_base/NodeList.js index 4053c152..7cc51902 100644 --- a/spring-js/src/main/resources/META-INF/dojo/_base/NodeList.js +++ b/spring-js/src/main/resources/META-INF/dojo/_base/NodeList.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo._base.NodeList"]){dojo._hasResource["dojo._base.NodeList"]=true;dojo.provide("dojo._base.NodeList");dojo.require("dojo._base.lang");dojo.require("dojo._base.array");(function(){var d=dojo;var _2=function(_3){_3.constructor=dojo.NodeList;dojo._mixin(_3,dojo.NodeList.prototype);return _3;};dojo.NodeList=function(){return _2(Array.apply(null,arguments));};dojo.NodeList._wrap=_2;dojo.extend(dojo.NodeList,{slice:function(){var a=dojo._toArray(arguments);return _2(a.slice.apply(this,a));},splice:function(){var a=dojo._toArray(arguments);return _2(a.splice.apply(this,a));},concat:function(){var a=dojo._toArray(arguments,0,[this]);return _2(a.concat.apply([],a));},indexOf:function(_7,_8){return d.indexOf(this,_7,_8);},lastIndexOf:function(){return d.lastIndexOf.apply(d,d._toArray(arguments,0,[this]));},every:function(_9,_a){return d.every(this,_9,_a);},some:function(_b,_c){return d.some(this,_b,_c);},map:function(_d,_e){return d.map(this,_d,_e,d.NodeList);},forEach:function(_f,_10){d.forEach(this,_f,_10);return this;},coords:function(){return d.map(this,d.coords);},style:function(){var aa=d._toArray(arguments,0,[null]);var s=this.map(function(i){aa[0]=i;return d.style.apply(d,aa);});return (arguments.length>1)?this:s;},styles:function(){d.deprecated("NodeList.styles","use NodeList.style instead","1.1");return this.style.apply(this,arguments);},addClass:function(_14){this.forEach(function(i){d.addClass(i,_14);});return this;},removeClass:function(_16){this.forEach(function(i){d.removeClass(i,_16);});return this;},place:function(_18,_19){var _1a=d.query(_18)[0];_19=_19||"last";for(var x=0;x1)||!d.isString(_a[0])))?this:s;};};dojo.NodeList=function(){return _2(Array.apply(null,arguments));};dojo.NodeList._wrap=_2;dojo.extend(dojo.NodeList,{slice:function(){var a=d._toArray(arguments);return _2(a.slice.apply(this,a));},splice:function(){var a=d._toArray(arguments);return _2(a.splice.apply(this,a));},concat:function(){var a=d._toArray(arguments,0,[this]);return _2(a.concat.apply([],a));},indexOf:function(_e,_f){return d.indexOf(this,_e,_f);},lastIndexOf:function(){return d.lastIndexOf.apply(d,d._toArray(arguments,0,[this]));},every:function(_10,_11){return d.every(this,_10,_11);},some:function(_12,_13){return d.some(this,_12,_13);},map:function(_14,obj){return d.map(this,_14,obj,d.NodeList);},forEach:function(_16,_17){d.forEach(this,_16,_17);return this;},coords:function(){return d.map(this,d.coords);},attr:_4("attr"),style:_4("style"),addClass:_4("addClass",true),removeClass:_4("removeClass",true),toggleClass:_4("toggleClass",true),connect:_4("connect",true),place:function(_18,_19){var _1a=d.query(_18)[0];return this.forEach(function(i){d.place(i,_1a,_19);});},orphan:function(_1c){return (_1c?d._filterQueryResult(this,_1c):this).forEach("if(item.parentNode){ item.parentNode.removeChild(item); }");},adopt:function(_1d,_1e){var _1f=this[0];return d.query(_1d).forEach(function(ai){d.place(ai,_1f,_1e||"last");});},query:function(_21){if(!_21){return this;}var ret=d.NodeList();this.forEach(function(_23){ret=ret.concat(d.query(_21,_23).filter(function(_24){return (_24!==undefined);}));});return ret;},filter:function(_25){var _26=this;var _a=arguments;var r=d.NodeList();var rp=function(t){if(t!==undefined){r.push(t);}};if(d.isString(_25)){_26=d._filterQueryResult(this,_a[0]);if(_a.length==1){return _26;}_a.shift();}d.forEach(d.filter(_26,_a[0],_a[1]),rp);return r;},addContent:function(_2b,_2c){var ta=d.doc.createElement("span");if(d.isString(_2b)){ta.innerHTML=_2b;}else{ta.appendChild(_2b);}if(_2c===undefined){_2c="last";}var ct=(_2c=="first"||_2c=="after")?"lastChild":"firstChild";this.forEach(function(_2f){var tn=ta.cloneNode(true);while(tn[ct]){d.place(tn[ct],_2f,_2c);}});return this;},empty:function(){return this.forEach("item.innerHTML='';");},instantiate:function(_31,_32){var c=d.isFunction(_31)?_31:d.getObject(_31);return this.forEach(function(i){new c(_32||{},i);});},at:function(){var nl=new dojo.NodeList();dojo.forEach(arguments,function(i){if(this[i]){nl.push(this[i]);}},this);return nl;}});d.forEach(["blur","focus","click","keydown","keypress","keyup","mousedown","mouseenter","mouseleave","mousemove","mouseout","mouseover","mouseup","submit","load","error"],function(evt){var _oe="on"+evt;d.NodeList.prototype[_oe]=function(a,b){return this.connect(_oe,a,b);};});})();} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/_base/_loader/bootstrap.js b/spring-js/src/main/resources/META-INF/dojo/_base/_loader/bootstrap.js index 97ef1e9b..8a89278f 100644 --- a/spring-js/src/main/resources/META-INF/dojo/_base/_loader/bootstrap.js +++ b/spring-js/src/main/resources/META-INF/dojo/_base/_loader/bootstrap.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -(function(){if(typeof this["djConfig"]=="undefined"){this.djConfig={};}if((!this["console"])||(!console["firebug"])){this.console={};}var cn=["assert","count","debug","dir","dirxml","error","group","groupEnd","info","log","profile","profileEnd","time","timeEnd","trace","warn"];var i=0,tn;while((tn=cn[i++])){if(!console[tn]){console[tn]=function(){};}}if(typeof this["dojo"]=="undefined"){this.dojo={};}var d=dojo;dojo.global=this;var _5={isDebug:false,libraryScriptUri:"",preventBackButtonFix:true,delayMozLoadingFix:false};for(var _6 in _5){if(typeof djConfig[_6]=="undefined"){djConfig[_6]=_5[_6];}}var _7=["Browser","Rhino","Spidermonkey","Mobile"];var t;while(t=_7.shift()){d["is"+t]=false;}dojo.locale=djConfig.locale;dojo.version={major:1,minor:0,patch:2,flag:"",revision:Number("$Rev: 11832 $".match(/[0-9]+/)[0]),toString:function(){with(d.version){return major+"."+minor+"."+patch+flag+" ("+revision+")";}}};if(typeof OpenAjax!="undefined"){OpenAjax.hub.registerLibrary("dojo","http://dojotoolkit.org",d.version.toString());}dojo._mixin=function(_9,_a){var _b={};for(var x in _a){if(_b[x]===undefined||_b[x]!=_a[x]){_9[x]=_a[x];}}if(d["isIE"]&&_a){var p=_a.toString;if(typeof p=="function"&&p!=_9.toString&&p!=_b.toString&&p!="\nfunction toString() {\n [native code]\n}\n"){_9.toString=_a.toString;}}return _9;};dojo.mixin=function(_e,_f){for(var i=1,l=arguments.length;i= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(typeof window!="undefined"){dojo.isBrowser=true;dojo._name="browser";(function(){var d=dojo;if(document&&document.getElementsByTagName){var _2=document.getElementsByTagName("script");var _3=/dojo(\.xd)?\.js([\?\.]|$)/i;for(var i=0;i<_2.length;i++){var _5=_2[i].getAttribute("src");if(!_5){continue;}var m=_5.match(_3);if(m){if(!djConfig["baseUrl"]){djConfig["baseUrl"]=_5.substring(0,m.index);}var _7=_2[i].getAttribute("djConfig");if(_7){var _8=eval("({ "+_7+" })");for(var x in _8){djConfig[x]=_8[x];}}break;}}}d.baseUrl=djConfig["baseUrl"];var n=navigator;var _b=n.userAgent;var _c=n.appVersion;var tv=parseFloat(_c);d.isOpera=(_b.indexOf("Opera")>=0)?tv:0;d.isKhtml=(_c.indexOf("Konqueror")>=0)||(_c.indexOf("Safari")>=0)?tv:0;if(_c.indexOf("Safari")>=0){d.isSafari=parseFloat(_c.split("Version/")[1])||2;}var _e=_b.indexOf("Gecko");d.isMozilla=d.isMoz=((_e>=0)&&(!d.isKhtml))?tv:0;d.isFF=0;d.isIE=0;try{if(d.isMoz){d.isFF=parseFloat(_b.split("Firefox/")[1].split(" ")[0]);}if((document.all)&&(!d.isOpera)){d.isIE=parseFloat(_c.split("MSIE ")[1].split(";")[0]);}}catch(e){}if(dojo.isIE&&(window.location.protocol==="file:")){djConfig.ieForceActiveXXhr=true;}var cm=document["compatMode"];d.isQuirks=(cm=="BackCompat")||(cm=="QuirksMode")||(d.isIE<6);d.locale=djConfig.locale||(d.isIE?n.userLanguage:n.language).toLowerCase();d._println=console.debug;d._XMLHTTP_PROGIDS=["Msxml2.XMLHTTP","Microsoft.XMLHTTP","Msxml2.XMLHTTP.4.0"];d._xhrObj=function(){var _10=null;var _11=null;if(!dojo.isIE||!djConfig.ieForceActiveXXhr){try{_10=new XMLHttpRequest();}catch(e){}}if(!_10){for(var i=0;i<3;++i){var _13=dojo._XMLHTTP_PROGIDS[i];try{_10=new ActiveXObject(_13);}catch(e){_11=e;}if(_10){dojo._XMLHTTP_PROGIDS=[_13];break;}}}if(!_10){throw new Error("XMLHTTP not available: "+_11);}return _10;};d._isDocumentOk=function(_14){var _15=_14.status||0;return ((_15>=200)&&(_15<300))||(_15==304)||(_15==1223)||(!_15&&(location.protocol=="file:"||location.protocol=="chrome:"));};var _16=window.location+"";var _17=document.getElementsByTagName("base");var _18=(_17&&_17.length>0);d._getText=function(uri,_1a){var _1b=this._xhrObj();if(!_18&&dojo._Url){uri=(new dojo._Url(_16,uri)).toString();}_1b.open("GET",uri,false);try{_1b.send(null);if(!d._isDocumentOk(_1b)){var err=Error("Unable to load "+uri+" status:"+_1b.status);err.status=_1b.status;err.responseText=_1b.responseText;throw err;}}catch(e){if(_1a){return null;}throw e;}return _1b.responseText;};})();dojo._initFired=false;dojo._loadInit=function(e){dojo._initFired=true;var _1e=(e&&e.type)?e.type.toLowerCase():"load";if(arguments.callee.initialized||(_1e!="domcontentloaded"&&_1e!="load")){return;}arguments.callee.initialized=true;if(typeof dojo["_khtmlTimer"]!="undefined"){clearInterval(dojo._khtmlTimer);delete dojo._khtmlTimer;}if(dojo._inFlightCount==0){dojo._modulesLoaded();}};if(document.addEventListener){if(dojo.isOpera||(dojo.isMoz&&(djConfig["enableMozDomContentLoaded"]===true))){document.addEventListener("DOMContentLoaded",dojo._loadInit,null);}window.addEventListener("load",dojo._loadInit,null);}if(/(WebKit|khtml)/i.test(navigator.userAgent)){dojo._khtmlTimer=setInterval(function(){if(/loaded|complete/.test(document.readyState)){dojo._loadInit();}},10);}(function(){var _w=window;var _20=function(_21,fp){var _23=_w[_21]||function(){};_w[_21]=function(){fp.apply(_w,arguments);_23.apply(_w,arguments);};};if(dojo.isIE){document.write(""+"");var _24=true;_20("onbeforeunload",function(){_w.setTimeout(function(){_24=false;},0);});_20("onunload",function(){if(_24){dojo.unloaded();}});try{document.namespaces.add("v","urn:schemas-microsoft-com:vml");document.createStyleSheet().addRule("v\\:*","behavior:url(#default#VML)");}catch(e){}}else{_20("onbeforeunload",function(){dojo.unloaded();});}})();}if(djConfig.isDebug){dojo.require("dojo._firebug.firebug");}if(djConfig.debugAtAllCosts){djConfig.useXDomain=true;dojo.require("dojo._base._loader.loader_xd");dojo.require("dojo._base._loader.loader_debug");dojo.require("dojo.i18n");} \ No newline at end of file +if(typeof window!="undefined"){dojo.isBrowser=true;dojo._name="browser";(function(){var d=dojo;if(document&&document.getElementsByTagName){var _2=document.getElementsByTagName("script");var _3=/dojo(\.xd)?\.js(\W|$)/i;for(var i=0;i<_2.length;i++){var _5=_2[i].getAttribute("src");if(!_5){continue;}var m=_5.match(_3);if(m){if(!d.config.baseUrl){d.config.baseUrl=_5.substring(0,m.index);}var _7=_2[i].getAttribute("djConfig");if(_7){var _8=eval("({ "+_7+" })");for(var x in _8){dojo.config[x]=_8[x];}}break;}}}d.baseUrl=d.config.baseUrl;var n=navigator;var _b=n.userAgent;var _c=n.appVersion;var tv=parseFloat(_c);if(_b.indexOf("Opera")>=0){d.isOpera=tv;}var _e=Math.max(_c.indexOf("WebKit"),_c.indexOf("Safari"),0);if(_e){d.isSafari=parseFloat(_c.split("Version/")[1])||(parseFloat(_c.substr(_e+7))>419.3)?3:2;}if(_b.indexOf("AdobeAIR")>=0){d.isAIR=1;}if(_c.indexOf("Konqueror")>=0||d.isSafari){d.isKhtml=tv;}if(_b.indexOf("Gecko")>=0&&!d.isKhtml){d.isMozilla=d.isMoz=tv;}if(d.isMoz){d.isFF=parseFloat(_b.split("Firefox/")[1])||undefined;}if(document.all&&!d.isOpera){d.isIE=parseFloat(_c.split("MSIE ")[1])||undefined;}if(dojo.isIE&&window.location.protocol==="file:"){dojo.config.ieForceActiveXXhr=true;}var cm=document.compatMode;d.isQuirks=cm=="BackCompat"||cm=="QuirksMode"||d.isIE<6;d.locale=dojo.config.locale||(d.isIE?n.userLanguage:n.language).toLowerCase();d._XMLHTTP_PROGIDS=["Msxml2.XMLHTTP","Microsoft.XMLHTTP","Msxml2.XMLHTTP.4.0"];d._xhrObj=function(){var _10=null;var _11=null;if(!dojo.isIE||!dojo.config.ieForceActiveXXhr){try{_10=new XMLHttpRequest();}catch(e){}}if(!_10){for(var i=0;i<3;++i){var _13=d._XMLHTTP_PROGIDS[i];try{_10=new ActiveXObject(_13);}catch(e){_11=e;}if(_10){d._XMLHTTP_PROGIDS=[_13];break;}}}if(!_10){throw new Error("XMLHTTP not available: "+_11);}return _10;};d._isDocumentOk=function(_14){var _15=_14.status||0;return (_15>=200&&_15<300)||_15==304||_15==1223||(!_15&&(location.protocol=="file:"||location.protocol=="chrome:"));};var _16=window.location+"";var _17=document.getElementsByTagName("base");var _18=(_17&&_17.length>0);d._getText=function(uri,_1a){var _1b=this._xhrObj();if(!_18&&dojo._Url){uri=(new dojo._Url(_16,uri)).toString();}if(d.config.cacheBust){uri+="";uri+=(uri.indexOf("?")==-1?"?":"&")+String(d.config.cacheBust).replace(/\W+/g,"");}_1b.open("GET",uri,false);try{_1b.send(null);if(!d._isDocumentOk(_1b)){var err=Error("Unable to load "+uri+" status:"+_1b.status);err.status=_1b.status;err.responseText=_1b.responseText;throw err;}}catch(e){if(_1a){return null;}throw e;}return _1b.responseText;};d._windowUnloaders=[];d.windowUnloaded=function(){var mll=this._windowUnloaders;while(mll.length){(mll.pop())();}};d.addOnWindowUnload=function(obj,_1f){d._onto(d._windowUnloaders,obj,_1f);};})();dojo._initFired=false;dojo._loadInit=function(e){dojo._initFired=true;var _21=(e&&e.type)?e.type.toLowerCase():"load";if(arguments.callee.initialized||(_21!="domcontentloaded"&&_21!="load")){return;}arguments.callee.initialized=true;if("_khtmlTimer" in dojo){clearInterval(dojo._khtmlTimer);delete dojo._khtmlTimer;}if(dojo._inFlightCount==0){dojo._modulesLoaded();}};dojo._fakeLoadInit=function(){dojo._loadInit({type:"load"});};if(!dojo.config.afterOnLoad){if(document.addEventListener){if(dojo.isOpera||dojo.isFF>=3||(dojo.isMoz&&dojo.config.enableMozDomContentLoaded===true)){document.addEventListener("DOMContentLoaded",dojo._loadInit,null);}window.addEventListener("load",dojo._loadInit,null);}if(dojo.isAIR){window.addEventListener("load",dojo._loadInit,null);}else{if(/(WebKit|khtml)/i.test(navigator.userAgent)){dojo._khtmlTimer=setInterval(function(){if(/loaded|complete/.test(document.readyState)){dojo._loadInit();}},10);}}}(function(){var _w=window;var _23=function(_24,fp){var _26=_w[_24]||function(){};_w[_24]=function(){fp.apply(_w,arguments);_26.apply(_w,arguments);};};if(dojo.isIE){if(!dojo.config.afterOnLoad){document.write(""+"");}try{document.namespaces.add("v","urn:schemas-microsoft-com:vml");document.createStyleSheet().addRule("v\\:*","behavior:url(#default#VML)");}catch(e){}}_23("onbeforeunload",function(){dojo.unloaded();});_23("onunload",function(){dojo.windowUnloaded();});})();}(function(){var mp=dojo.config["modulePaths"];if(mp){for(var _28 in mp){dojo.registerModulePath(_28,mp[_28]);}}})();if(dojo.config.isDebug){dojo.require("dojo._firebug.firebug");}if(dojo.config.debugAtAllCosts){dojo.config.useXDomain=true;dojo.require("dojo._base._loader.loader_xd");dojo.require("dojo._base._loader.loader_debug");dojo.require("dojo.i18n");} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/_base/_loader/hostenv_rhino.js b/spring-js/src/main/resources/META-INF/dojo/_base/_loader/hostenv_rhino.js index 18f24f6b..fb34426f 100644 --- a/spring-js/src/main/resources/META-INF/dojo/_base/_loader/hostenv_rhino.js +++ b/spring-js/src/main/resources/META-INF/dojo/_base/_loader/hostenv_rhino.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(djConfig["baseUrl"]){dojo.baseUrl=djConfig["baseUrl"];}else{dojo.baseUrl="./";}dojo.locale=dojo.locale||String(java.util.Locale.getDefault().toString().replace("_","-").toLowerCase());dojo._name="rhino";dojo.isRhino=true;if(typeof print=="function"){console.debug=print;}if(typeof dojo["byId"]=="undefined"){dojo.byId=function(id,_2){if(id&&(typeof id=="string"||id instanceof String)){if(!_2){_2=document;}return _2.getElementById(id);}return id;};}dojo._loadUri=function(_3,cb){try{var _5=(new java.io.File(_3)).exists();if(!_5){try{var _6=(new java.net.URL(_3)).openStream();_6.close();}catch(e){return false;}}if(cb){var _7=(_5?readText:readUri)(_3,"UTF-8");cb(eval("("+_7+")"));}else{load(_3);}return true;}catch(e){console.debug("rhino load('"+_3+"') failed. Exception: "+e);return false;}};dojo.exit=function(_8){quit(_8);};dojo._rhinoCurrentScriptViaJava=function(_9){var _a=Packages.org.mozilla.javascript.Context.getCurrentContext().getOptimizationLevel();var _b=new java.io.CharArrayWriter();var pw=new java.io.PrintWriter(_b);var _d=new java.lang.Exception();var s=_b.toString();var _f=s.match(/[^\(]*\.js\)/gi);if(!_f){throw Error("cannot parse printStackTrace output: "+s);}var _10=((typeof _9!="undefined")&&(_9))?_f[_9+1]:_f[_f.length-1];var _10=_f[3];if(!_10){_10=_f[1];}if(!_10){throw Error("could not find js file in printStackTrace output: "+s);}return _10;};function readText(_11,_12){_12=_12||"utf-8";var jf=new java.io.File(_11);var is=new java.io.FileInputStream(jf);return dj_readInputStream(is,_12);};function readUri(uri,_16){var _17=(new java.net.URL(uri)).openConnection();_16=_16||_17.getContentEncoding()||"utf-8";var is=_17.getInputStream();return dj_readInputStream(is,_16);};function dj_readInputStream(is,_1a){var _1b=new java.io.BufferedReader(new java.io.InputStreamReader(is,_1a));try{var sb=new java.lang.StringBuffer();var _1d="";while((_1d=_1b.readLine())!==null){sb.append(_1d);sb.append(java.lang.System.getProperty("line.separator"));}return sb.toString();}finally{_1b.close();}};if(!djConfig.libraryScriptUri.length){try{djConfig.libraryScriptUri=dojo._rhinoCurrentScriptViaJava(1);}catch(e){if(djConfig["isDebug"]){print("\n");print("we have no idea where Dojo is located.");print("Please try loading rhino in a non-interpreted mode or set a");print("\n\tdjConfig.libraryScriptUri\n");print("Setting the dojo path to './'");print("This is probably wrong!");print("\n");print("Dojo will try to load anyway");}djConfig.libraryScriptUri="./";}}dojo.doc=typeof (document)!="undefined"?document:null;dojo.body=function(){return document.body;};dojo._timeouts=[];function clearTimeout(idx){if(!dojo._timeouts[idx]){return;}dojo._timeouts[idx].stop();};function setTimeout(_1f,_20){var def={sleepTime:_20,hasSlept:false,run:function(){if(!this.hasSlept){this.hasSlept=true;java.lang.Thread.currentThread().sleep(this.sleepTime);}try{_1f();}catch(e){console.debug("Error running setTimeout thread:"+e);}}};var _22=new java.lang.Runnable(def);var _23=new java.lang.Thread(_22);_23.start();return dojo._timeouts.push(_23)-1;};if(djConfig["modulePaths"]){for(var param in djConfig["modulePaths"]){dojo.registerModulePath(param,djConfig["modulePaths"][param]);}} \ No newline at end of file +if(dojo.config["baseUrl"]){dojo.baseUrl=dojo.config["baseUrl"];}else{dojo.baseUrl="./";}dojo.locale=dojo.locale||String(java.util.Locale.getDefault().toString().replace("_","-").toLowerCase());dojo._name="rhino";dojo.isRhino=true;if(typeof print=="function"){console.debug=print;}if(typeof dojo["byId"]=="undefined"){dojo.byId=function(id,_2){if(id&&(typeof id=="string"||id instanceof String)){if(!_2){_2=document;}return _2.getElementById(id);}return id;};}dojo._loadUri=function(_3,cb){try{var _5=(new java.io.File(_3)).exists();if(!_5){try{var _6=(new java.net.URL(_3)).openStream();_6.close();}catch(e){return false;}}if(cb){var _7=(_5?readText:readUri)(_3,"UTF-8");cb(eval("("+_7+")"));}else{load(_3);}return true;}catch(e){console.debug("rhino load('"+_3+"') failed. Exception: "+e);return false;}};dojo.exit=function(_8){quit(_8);};dojo._rhinoCurrentScriptViaJava=function(_9){var _a=Packages.org.mozilla.javascript.Context.getCurrentContext().getOptimizationLevel();var _b=new java.io.CharArrayWriter();var pw=new java.io.PrintWriter(_b);var _d=new java.lang.Exception();var s=_b.toString();var _f=s.match(/[^\(]*\.js\)/gi);if(!_f){throw Error("cannot parse printStackTrace output: "+s);}var _10=((typeof _9!="undefined")&&(_9))?_f[_9+1]:_f[_f.length-1];_10=_f[3];if(!_10){_10=_f[1];}if(!_10){throw Error("could not find js file in printStackTrace output: "+s);}return _10;};function readText(_11,_12){_12=_12||"utf-8";var jf=new java.io.File(_11);var is=new java.io.FileInputStream(jf);return dj_readInputStream(is,_12);};function readUri(uri,_16){var _17=(new java.net.URL(uri)).openConnection();_16=_16||_17.getContentEncoding()||"utf-8";var is=_17.getInputStream();return dj_readInputStream(is,_16);};function dj_readInputStream(is,_1a){var _1b=new java.io.BufferedReader(new java.io.InputStreamReader(is,_1a));try{var sb=new java.lang.StringBuffer();var _1d="";while((_1d=_1b.readLine())!==null){sb.append(_1d);sb.append(java.lang.System.getProperty("line.separator"));}return sb.toString();}finally{_1b.close();}};if((!dojo.config.libraryScriptUri)||(!dojo.config.libraryScriptUri.length)){try{dojo.config.libraryScriptUri=dojo._rhinoCurrentScriptViaJava(1);}catch(e){if(dojo.config["isDebug"]){print("\n");print("we have no idea where Dojo is located.");print("Please try loading rhino in a non-interpreted mode or set a");print("\n\tdjConfig.libraryScriptUri\n");print("Setting the dojo path to './'");print("This is probably wrong!");print("\n");print("Dojo will try to load anyway");}dojo.config.libraryScriptUri="./";}}dojo.doc=typeof (document)!="undefined"?document:null;dojo.body=function(){return document.body;};try{setTimeout;clearTimeout;}catch(e){dojo._timeouts=[];function clearTimeout(idx){if(!dojo._timeouts[idx]){return;}dojo._timeouts[idx].stop();};function setTimeout(_1f,_20){var def={sleepTime:_20,hasSlept:false,run:function(){if(!this.hasSlept){this.hasSlept=true;java.lang.Thread.currentThread().sleep(this.sleepTime);}try{_1f();}catch(e){console.debug("Error running setTimeout thread:"+e);}}};var _22=new java.lang.Runnable(def);var _23=new java.lang.Thread(_22);_23.start();return dojo._timeouts.push(_23)-1;};}if(dojo.config["modulePaths"]){for(var param in dojo.config["modulePaths"]){dojo.registerModulePath(param,dojo.config["modulePaths"][param]);}} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/_base/_loader/hostenv_spidermonkey.js b/spring-js/src/main/resources/META-INF/dojo/_base/_loader/hostenv_spidermonkey.js index aad59288..44a88663 100644 --- a/spring-js/src/main/resources/META-INF/dojo/_base/_loader/hostenv_spidermonkey.js +++ b/spring-js/src/main/resources/META-INF/dojo/_base/_loader/hostenv_spidermonkey.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(djConfig["baseUrl"]){dojo.baseUrl=djConfig["baseUrl"];}else{dojo.baseUrl="./";}dojo._name="spidermonkey";dojo.isSpidermonkey=true;dojo.exit=function(_1){quit(_1);};if(typeof print=="function"){console.debug=print;}if(typeof line2pc=="undefined"){throw new Error("attempt to use SpiderMonkey host environment when no 'line2pc' global");}dojo._spidermonkeyCurrentFile=function(_2){var s="";try{throw Error("whatever");}catch(e){s=e.stack;}var _4=s.match(/[^@]*\.js/gi);if(!_4){throw Error("could not parse stack string: '"+s+"'");}var _5=(typeof _2!="undefined"&&_2)?_4[_2+1]:_4[_4.length-1];if(!_5){throw Error("could not find file name in stack string '"+s+"'");}return _5;};dojo._loadUri=function(_6){var ok=load(_6);return 1;};if(djConfig["modulePaths"]){for(var param in djConfig["modulePaths"]){dojo.registerModulePath(param,djConfig["modulePaths"][param]);}} \ No newline at end of file +if(dojo.config["baseUrl"]){dojo.baseUrl=dojo.config["baseUrl"];}else{dojo.baseUrl="./";}dojo._name="spidermonkey";dojo.isSpidermonkey=true;dojo.exit=function(_1){quit(_1);};if(typeof print=="function"){console.debug=print;}if(typeof line2pc=="undefined"){throw new Error("attempt to use SpiderMonkey host environment when no 'line2pc' global");}dojo._spidermonkeyCurrentFile=function(_2){var s="";try{throw Error("whatever");}catch(e){s=e.stack;}var _4=s.match(/[^@]*\.js/gi);if(!_4){throw Error("could not parse stack string: '"+s+"'");}var _5=(typeof _2!="undefined"&&_2)?_4[_2+1]:_4[_4.length-1];if(!_5){throw Error("could not find file name in stack string '"+s+"'");}return _5;};dojo._loadUri=function(_6){var ok=load(_6);return 1;};if(dojo.config["modulePaths"]){for(var param in dojo.config["modulePaths"]){dojo.registerModulePath(param,dojo.config["modulePaths"][param]);}} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/_base/_loader/loader.js b/spring-js/src/main/resources/META-INF/dojo/_base/_loader/loader.js index 806c42cf..38c58a79 100644 --- a/spring-js/src/main/resources/META-INF/dojo/_base/_loader/loader.js +++ b/spring-js/src/main/resources/META-INF/dojo/_base/_loader/loader.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo.foo"]){dojo._hasResource["dojo.foo"]=true;(function(){var d=dojo;dojo.mixin(dojo,{_loadedModules:{},_inFlightCount:0,_hasResource:{},_modulePrefixes:{dojo:{name:"dojo",value:"."},doh:{name:"doh",value:"../util/doh"},tests:{name:"tests",value:"tests"}},_moduleHasPrefix:function(_2){var mp=this._modulePrefixes;return !!(mp[_2]&&mp[_2].value);},_getModulePrefix:function(_4){var mp=this._modulePrefixes;if(this._moduleHasPrefix(_4)){return mp[_4].value;}return _4;},_loadedUrls:[],_postLoad:false,_loaders:[],_unloaders:[],_loadNotifying:false});dojo._loadPath=function(_6,_7,cb){var _9=(((_6.charAt(0)=="/"||_6.match(/^\w+:/)))?"":this.baseUrl)+_6;if(djConfig.cacheBust&&d.isBrowser){_9+="?"+String(djConfig.cacheBust).replace(/\W+/g,"");}try{return !_7?this._loadUri(_9,cb):this._loadUriAndCheck(_9,_7,cb);}catch(e){console.debug(e);return false;}};dojo._loadUri=function(_a,cb){if(this._loadedUrls[_a]){return true;}var _c=this._getText(_a,true);if(!_c){return false;}this._loadedUrls[_a]=true;this._loadedUrls.push(_a);if(cb){_c="("+_c+")";}var _d=d["eval"](_c+"\r\n//@ sourceURL="+_a);if(cb){cb(_d);}return true;};dojo._loadUriAndCheck=function(_e,_f,cb){var ok=false;try{ok=this._loadUri(_e,cb);}catch(e){console.debug("failed loading "+_e+" with error: "+e);}return Boolean(ok&&this._loadedModules[_f]);};dojo.loaded=function(){this._loadNotifying=true;this._postLoad=true;var mll=this._loaders;this._loaders=[];for(var x=0;x0){d._callLoaded();}};dojo.unloaded=function(){var mll=this._unloaders;while(mll.length){(mll.pop())();}};dojo.addOnLoad=function(obj,_16){if(arguments.length==1){d._loaders.push(obj);}else{if(arguments.length>1){d._loaders.push(function(){obj[_16]();});}}if(d._postLoad&&d._inFlightCount==0&&!d._loadNotifying){d._callLoaded();}};dojo.addOnUnload=function(obj,_18){if(arguments.length==1){d._unloaders.push(obj);}else{if(arguments.length>1){d._unloaders.push(function(){obj[_18]();});}}};dojo._modulesLoaded=function(){if(d._postLoad){return;}if(d._inFlightCount>0){console.debug("files still in flight!");return;}d._callLoaded();};dojo._callLoaded=function(){if(typeof setTimeout=="object"||(djConfig["useXDomain"]&&d.isOpera)){setTimeout("dojo.loaded();",0);}else{d.loaded();}};dojo._getModuleSymbols=function(_19){var _1a=_19.split(".");for(var i=_1a.length;i>0;i--){var _1c=_1a.slice(0,i).join(".");if((i==1)&&!this._moduleHasPrefix(_1c)){_1a[0]="../"+_1a[0];}else{var _1d=this._getModulePrefix(_1c);if(_1d!=_1c){_1a.splice(0,i,_1d);break;}}}return _1a;};dojo._global_omit_module_check=false;dojo._loadModule=dojo.require=function(_1e,_1f){_1f=this._global_omit_module_check||_1f;var _20=this._loadedModules[_1e];if(_20){return _20;}var _21=this._getModuleSymbols(_1e).join("/")+".js";var _22=(!_1f)?_1e:null;var ok=this._loadPath(_21,_22);if((!ok)&&(!_1f)){throw new Error("Could not load '"+_1e+"'; last tried '"+_21+"'");}if((!_1f)&&(!this["_isXDomain"])){_20=this._loadedModules[_1e];if(!_20){throw new Error("symbol '"+_1e+"' is not defined after loading '"+_21+"'");}}return _20;};dojo.provide=function(_24){_24=_24+"";return (d._loadedModules[_24]=d.getObject(_24,true));};dojo.platformRequire=function(_25){var _26=_25["common"]||[];var _27=_26.concat(_25[d._name]||_25["default"]||[]);for(var x=0;x<_27.length;x++){var _29=_27[x];if(_29.constructor==Array){d._loadModule.apply(d,_29);}else{d._loadModule(_29);}}};dojo.requireIf=function(_2a,_2b){if(_2a===true){var _2c=[];for(var i=1;i0&&!(j==1&&_3d[0]=="")&&_3d[j]==".."&&_3d[j-1]!=".."){if(j==(_3d.length-1)){_3d.splice(j,1);_3d[j-1]="";}else{_3d.splice(j-1,2);j-=2;}}}}_3a.path=_3d.join("/");}}}}uri="";if(_3a.scheme){uri+=_3a.scheme+":";}if(_3a.authority){uri+="//"+_3a.authority;}uri+=_3a.path;if(_3a.query){uri+="?"+_3a.query;}if(_3a.fragment){uri+="#"+_3a.fragment;}}this.uri=uri.toString();var r=this.uri.match(ore);this.scheme=r[2]||(r[1]?"":n);this.authority=r[4]||(r[3]?"":n);this.path=r[5];this.query=r[7]||(r[6]?"":n);this.fragment=r[9]||(r[8]?"":n);if(this.authority!=n){r=this.authority.match(ire);this.user=r[3]||n;this.password=r[4]||n;this.host=r[5];this.port=r[7]||n;}};dojo._Url.prototype.toString=function(){return this.uri;};dojo.moduleUrl=function(_40,url){var loc=dojo._getModuleSymbols(_40).join("/");if(!loc){return null;}if(loc.lastIndexOf("/")!=loc.length-1){loc+="/";}var _43=loc.indexOf(":");if(loc.charAt(0)!="/"&&(_43==-1||_43>loc.indexOf("/"))){loc=d.baseUrl+loc;}return new d._Url(loc,url);};})();} \ No newline at end of file +if(!dojo._hasResource["dojo.foo"]){dojo._hasResource["dojo.foo"]=true;(function(){var d=dojo;d.mixin(d,{_loadedModules:{},_inFlightCount:0,_hasResource:{},_modulePrefixes:{dojo:{name:"dojo",value:"."},doh:{name:"doh",value:"../util/doh"},tests:{name:"tests",value:"tests"}},_moduleHasPrefix:function(_2){var mp=this._modulePrefixes;return !!(mp[_2]&&mp[_2].value);},_getModulePrefix:function(_4){var mp=this._modulePrefixes;if(this._moduleHasPrefix(_4)){return mp[_4].value;}return _4;},_loadedUrls:[],_postLoad:false,_loaders:[],_unloaders:[],_loadNotifying:false});dojo._loadPath=function(_6,_7,cb){var _9=((_6.charAt(0)=="/"||_6.match(/^\w+:/))?"":this.baseUrl)+_6;try{return !_7?this._loadUri(_9,cb):this._loadUriAndCheck(_9,_7,cb);}catch(e){console.error(e);return false;}};dojo._loadUri=function(_a,cb){if(this._loadedUrls[_a]){return true;}var _c=this._getText(_a,true);if(!_c){return false;}this._loadedUrls[_a]=true;this._loadedUrls.push(_a);if(cb){_c="("+_c+")";}else{_c=this._scopePrefix+_c+this._scopeSuffix;}if(d.isMoz){_c+="\r\n//@ sourceURL="+_a;}var _d=d["eval"](_c);if(cb){cb(_d);}return true;};dojo._loadUriAndCheck=function(_e,_f,cb){var ok=false;try{ok=this._loadUri(_e,cb);}catch(e){console.error("failed loading "+_e+" with error: "+e);}return !!(ok&&this._loadedModules[_f]);};dojo.loaded=function(){this._loadNotifying=true;this._postLoad=true;var mll=d._loaders;this._loaders=[];for(var x=0;x0){console.warn("files still in flight!");return;}d._callLoaded();};dojo._callLoaded=function(){if(typeof setTimeout=="object"||(dojo.config.useXDomain&&d.isOpera)){if(dojo.isAIR){setTimeout(function(){dojo.loaded();},0);}else{setTimeout(dojo._scopeName+".loaded();",0);}}else{d.loaded();}};dojo._getModuleSymbols=function(_1e){var _1f=_1e.split(".");for(var i=_1f.length;i>0;i--){var _21=_1f.slice(0,i).join(".");if((i==1)&&!this._moduleHasPrefix(_21)){_1f[0]="../"+_1f[0];}else{var _22=this._getModulePrefix(_21);if(_22!=_21){_1f.splice(0,i,_22);break;}}}return _1f;};dojo._global_omit_module_check=false;dojo.loadInit=function(_23){_23();};dojo._loadModule=dojo.require=function(_24,_25){_25=this._global_omit_module_check||_25;var _26=this._loadedModules[_24];if(_26){return _26;}var _27=this._getModuleSymbols(_24).join("/")+".js";var _28=(!_25)?_24:null;var ok=this._loadPath(_27,_28);if(!ok&&!_25){throw new Error("Could not load '"+_24+"'; last tried '"+_27+"'");}if(!_25&&!this._isXDomain){_26=this._loadedModules[_24];if(!_26){throw new Error("symbol '"+_24+"' is not defined after loading '"+_27+"'");}}return _26;};dojo.provide=function(_2a){_2a=_2a+"";return (d._loadedModules[_2a]=d.getObject(_2a,true));};dojo.platformRequire=function(_2b){var _2c=_2b.common||[];var _2d=_2c.concat(_2b[d._name]||_2b["default"]||[]);for(var x=0;x<_2d.length;x++){var _2f=_2d[x];if(_2f.constructor==Array){d._loadModule.apply(d,_2f);}else{d._loadModule(_2f);}}};dojo.requireIf=function(_30,_31){if(_30===true){var _32=[];for(var i=1;i0&&!(j==1&&_43[0]=="")&&_43[j]==".."&&_43[j-1]!=".."){if(j==(_43.length-1)){_43.splice(j,1);_43[j-1]="";}else{_43.splice(j-1,2);j-=2;}}}}_40.path=_43.join("/");}}}}uri=[];if(_40.scheme){uri.push(_40.scheme,":");}if(_40.authority){uri.push("//",_40.authority);}uri.push(_40.path);if(_40.query){uri.push("?",_40.query);}if(_40.fragment){uri.push("#",_40.fragment);}}this.uri=uri.join("");var r=this.uri.match(ore);this.scheme=r[2]||(r[1]?"":n);this.authority=r[4]||(r[3]?"":n);this.path=r[5];this.query=r[7]||(r[6]?"":n);this.fragment=r[9]||(r[8]?"":n);if(this.authority!=n){r=this.authority.match(ire);this.user=r[3]||n;this.password=r[4]||n;this.host=r[6]||r[7];this.port=r[9]||n;}};dojo._Url.prototype.toString=function(){return this.uri;};dojo.moduleUrl=function(_46,url){var loc=d._getModuleSymbols(_46).join("/");if(!loc){return null;}if(loc.lastIndexOf("/")!=loc.length-1){loc+="/";}var _49=loc.indexOf(":");if(loc.charAt(0)!="/"&&(_49==-1||_49>loc.indexOf("/"))){loc=d.baseUrl+loc;}return new d._Url(loc,url);};})();} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/_base/_loader/loader_debug.js b/spring-js/src/main/resources/META-INF/dojo/_base/_loader/loader_debug.js index cea8c852..3d8ce86a 100644 --- a/spring-js/src/main/resources/META-INF/dojo/_base/_loader/loader_debug.js +++ b/spring-js/src/main/resources/META-INF/dojo/_base/_loader/loader_debug.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo._base._loader.loader_debug"]){dojo._hasResource["dojo._base._loader.loader_debug"]=true;dojo.provide("dojo._base._loader.loader_debug");dojo.nonDebugProvide=dojo.provide;dojo.provide=function(_1){var _2=dojo["_xdDebugQueue"];if(_2&&_2.length>0&&_1==_2["currentResourceName"]){window.setTimeout("dojo._xdDebugFileLoaded('"+_1+"')",1);}return dojo.nonDebugProvide.apply(dojo,arguments);};dojo._xdDebugFileLoaded=function(_3){var _4=this._xdDebugQueue;if(_3&&_3==_4.currentResourceName){_4.shift();}if(_4.length==0){_4.currentResourceName=null;this._xdNotifyLoaded();}else{_4.currentResourceName=_4[0].resourceName;var _5=document.createElement("script");_5.type="text/javascript";_5.src=_4[0].resourcePath;document.getElementsByTagName("head")[0].appendChild(_5);}};} \ No newline at end of file +if(!dojo._hasResource["dojo._base._loader.loader_debug"]){dojo._hasResource["dojo._base._loader.loader_debug"]=true;dojo.provide("dojo._base._loader.loader_debug");dojo.nonDebugProvide=dojo.provide;dojo.provide=function(_1){var _2=dojo["_xdDebugQueue"];if(_2&&_2.length>0&&_1==_2["currentResourceName"]){if(dojo.isAIR){window.setTimeout(function(){dojo._xdDebugFileLoaded(_1);},1);}else{window.setTimeout(dojo._scopeName+"._xdDebugFileLoaded('"+_1+"')",1);}}return dojo.nonDebugProvide.apply(dojo,arguments);};dojo._xdDebugFileLoaded=function(_3){if(!this._xdDebugScopeChecked){if(dojo._scopeName!="dojo"){window.dojo=window[dojo.config.scopeMap[0][1]];window.dijit=window[dojo.config.scopeMap[1][1]];window.dojox=window[dojo.config.scopeMap[2][1]];}this._xdDebugScopeChecked=true;}var _4=this._xdDebugQueue;if(_3&&_3==_4.currentResourceName){_4.shift();}if(_4.length==0){dojo._xdWatchInFlight();}if(_4.length==0){_4.currentResourceName=null;for(var _5 in this._xdInFlight){if(this._xdInFlight[_5]===true){return;}}this._xdNotifyLoaded();}else{if(_3==_4.currentResourceName){_4.currentResourceName=_4[0].resourceName;var _6=document.createElement("script");_6.type="text/javascript";_6.src=_4[0].resourcePath;document.getElementsByTagName("head")[0].appendChild(_6);}}};} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/_base/_loader/loader_xd.js b/spring-js/src/main/resources/META-INF/dojo/_base/_loader/loader_xd.js index 4edb16f1..3f873116 100644 --- a/spring-js/src/main/resources/META-INF/dojo/_base/_loader/loader_xd.js +++ b/spring-js/src/main/resources/META-INF/dojo/_base/_loader/loader_xd.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo._base._loader.loader_xd"]){dojo._hasResource["dojo._base._loader.loader_xd"]=true;dojo.provide("dojo._base._loader.loader_xd");dojo._xdReset=function(){this._isXDomain=djConfig.useXDomain||false;this._xdTimer=0;this._xdInFlight={};this._xdOrderedReqs=[];this._xdDepMap={};this._xdContents=[];this._xdDefList=[];};dojo._xdReset();dojo._xdCreateResource=function(_1,_2,_3){var _4=_1.replace(/(\/\*([\s\S]*?)\*\/|\/\/(.*)$)/mg,"");var _5=[];var _6=/dojo.(require|requireIf|provide|requireAfterIf|platformRequire|requireLocalization)\(([\w\W]*?)\)/mg;var _7;while((_7=_6.exec(_4))!=null){if(_7[1]=="requireLocalization"){eval(_7[0]);}else{_5.push("\""+_7[1]+"\", "+_7[2]);}}var _8=[];_8.push("dojo._xdResourceLoaded({\n");if(_5.length>0){_8.push("depends: [");for(var i=0;i<_5.length;i++){if(i>0){_8.push(",\n");}_8.push("["+_5[i]+"]");}_8.push("],");}_8.push("\ndefineResource: function(dojo){");if(!djConfig["debugAtAllCosts"]||_2=="dojo._base._loader.loader_debug"){_8.push(_1);}_8.push("\n}, resourceName: '"+_2+"', resourcePath: '"+_3+"'});");return _8.join("");};dojo._xdIsXDomainPath=function(_a){var _b=_a.indexOf(":");var _c=_a.indexOf("/");if(_b>0&&_b<_c){return true;}else{var _d=this.baseUrl;_b=_d.indexOf(":");_c=_d.indexOf("/");if(_b>0&&_b<_c&&(!location.host||_d.indexOf("http://"+location.host)!=0)){return true;}}return false;};dojo._loadPath=function(_e,_f,cb){var _11=this._xdIsXDomainPath(_e);this._isXDomain|=_11;var uri=this.baseUrl+_e;if(_11){var _13=_e.indexOf(":");var _14=_e.indexOf("/");if(_13>0&&_13<_14){uri=_e;}}if(djConfig.cacheBust&&dojo.isBrowser){uri+="?"+String(djConfig.cacheBust).replace(/\W+/g,"");}try{return ((!_f||this._isXDomain)?this._loadUri(uri,cb,_11,_f):this._loadUriAndCheck(uri,_f,cb));}catch(e){console.debug(e);return false;}};dojo._loadUri=function(uri,cb,_17,_18){if(this._loadedUrls[uri]){return 1;}if(this._isXDomain&&_18&&_18!="dojo.i18n"){this._xdOrderedReqs.push(_18);if(_17||uri.indexOf("/nls/")==-1){this._xdInFlight[_18]=true;this._inFlightCount++;}if(!this._xdTimer){this._xdTimer=setInterval("dojo._xdWatchInFlight();",100);}this._xdStartTime=(new Date()).getTime();}if(_17){var _19=uri.lastIndexOf(".");if(_19<=0){_19=uri.length-1;}var _1a=uri.substring(0,_19)+".xd";if(_19!=uri.length-1){_1a+=uri.substring(_19,uri.length);}var _1b=document.createElement("script");_1b.type="text/javascript";_1b.src=_1a;if(!this.headElement){this._headElement=document.getElementsByTagName("head")[0];if(!this._headElement){this._headElement=document.getElementsByTagName("html")[0];}}this._headElement.appendChild(_1b);}else{var _1c=this._getText(uri,null,true);if(_1c==null){return 0;}if(this._isXDomain&&uri.indexOf("/nls/")==-1&&_18!="dojo.i18n"){var res=this._xdCreateResource(_1c,_18,uri);dojo.eval(res);}else{if(cb){_1c="("+_1c+")";}var _1e=dojo.eval(_1c);if(cb){cb(_1e);}}}this._loadedUrls[uri]=true;this._loadedUrls.push(uri);return true;};dojo._xdResourceLoaded=function(res){var _20=res.depends;var _21=null;var _22=null;var _23=[];if(_20&&_20.length>0){var dep=null;var _25=0;var _26=false;for(var i=0;i<_20.length;i++){dep=_20[i];if(dep[0]=="provide"){_23.push(dep[1]);}else{if(!_21){_21=[];}if(!_22){_22=[];}var _28=this._xdUnpackDependency(dep);if(_28.requires){_21=_21.concat(_28.requires);}if(_28.requiresAfter){_22=_22.concat(_28.requiresAfter);}}var _29=dep[0];var _2a=_29.split(".");if(_2a.length==2){dojo[_2a[0]][_2a[1]].apply(dojo[_2a[0]],dep.slice(1));}else{dojo[_29].apply(dojo,dep.slice(1));}}if(_23.length==1&&_23[0]=="dojo._base._loader.loader_debug"){res.defineResource(dojo);}else{var _2b=this._xdContents.push({content:res.defineResource,resourceName:res["resourceName"],resourcePath:res["resourcePath"],isDefined:false})-1;for(var i=0;i<_23.length;i++){this._xdDepMap[_23[i]]={requires:_21,requiresAfter:_22,contentIndex:_2b};}}for(var i=0;i<_23.length;i++){this._xdInFlight[_23[i]]=false;}}};dojo._xdLoadFlattenedBundle=function(_2c,_2d,_2e,_2f){_2e=_2e||"root";var _30=dojo.i18n.normalizeLocale(_2e).replace("-","_");var _31=[_2c,"nls",_2d].join(".");var _32=dojo["provide"](_31);_32[_30]=_2f;var _33=[_2c,_30,_2d].join(".");var _34=dojo._xdBundleMap[_33];if(_34){for(var _35 in _34){_32[_35]=_2f;}}};dojo._xdInitExtraLocales=function(){var _36=djConfig.extraLocale;if(_36){if(!_36 instanceof Array){_36=[_36];}dojo._xdReqLoc=dojo.xdRequireLocalization;dojo.xdRequireLocalization=function(m,b,_39,_3a){dojo._xdReqLoc(m,b,_39,_3a);if(_39){return;}for(var i=0;i<_36.length;i++){dojo._xdReqLoc(m,b,_36[i],_3a);}};}};dojo._xdBundleMap={};dojo.xdRequireLocalization=function(_3c,_3d,_3e,_3f){if(dojo._xdInitExtraLocales){dojo._xdInitExtraLocales();dojo._xdInitExtraLocales=null;dojo.xdRequireLocalization.apply(dojo,arguments);return;}var _40=_3f.split(",");var _41=dojo.i18n.normalizeLocale(_3e);var _42="";for(var i=0;i<_40.length;i++){if(_41.indexOf(_40[i])==0){if(_40[i].length>_42.length){_42=_40[i];}}}var _44=_42.replace("-","_");var _45=dojo.getObject([_3c,"nls",_3d].join("."));if(_45&&_45[_44]){bundle[_41.replace("-","_")]=_45[_44];}else{var _46=[_3c,(_44||"root"),_3d].join(".");var _47=dojo._xdBundleMap[_46];if(!_47){_47=dojo._xdBundleMap[_46]={};}_47[_41.replace("-","_")]=true;dojo.require(_3c+".nls"+(_42?"."+_42:"")+"."+_3d);}};dojo._xdRealRequireLocalization=dojo.requireLocalization;dojo.requireLocalization=function(_48,_49,_4a,_4b){var _4c=this.moduleUrl(_48).toString();if(this._xdIsXDomainPath(_4c)){return dojo.xdRequireLocalization.apply(dojo,arguments);}else{return dojo._xdRealRequireLocalization.apply(dojo,arguments);}};dojo._xdUnpackDependency=function(dep){var _4e=null;var _4f=null;switch(dep[0]){case "requireIf":case "requireAfterIf":if(dep[1]===true){_4e=[{name:dep[2],content:null}];}break;case "platformRequire":var _50=dep[1];var _51=_50["common"]||[];var _4e=(_50[dojo.hostenv.name_])?_51.concat(_50[dojo.hostenv.name_]||[]):_51.concat(_50["default"]||[]);if(_4e){for(var i=0;i<_4e.length;i++){if(_4e[i] instanceof Array){_4e[i]={name:_4e[i][0],content:null};}else{_4e[i]={name:_4e[i],content:null};}}}break;case "require":_4e=[{name:dep[1],content:null}];break;case "i18n._preloadLocalizations":dojo.i18n._preloadLocalizations.apply(dojo.i18n._preloadLocalizations,dep.slice(1));break;}if(dep[0]=="requireAfterIf"||dep[0]=="requireIf"){_4f=_4e;_4e=null;}return {requires:_4e,requiresAfter:_4f};};dojo._xdWalkReqs=function(){var _53=null;var req;for(var i=0;i0){var req=_56[_56.length-1];var res=this._xdDepMap[req];if(res){var _59=res.requires;if(_59&&_59.length>0){var _5a;for(var i=0;i<_59.length;i++){_5a=_59[i].name;if(_5a&&!_56[_5a]){_56.push(_5a);_56[_5a]=true;this._xdEvalReqs(_56);}}}var _5c=this._xdContents[res.contentIndex];if(!_5c.isDefined){var _5d=_5c.content;_5d["resourceName"]=_5c["resourceName"];_5d["resourcePath"]=_5c["resourcePath"];this._xdDefList.push(_5d);_5c.isDefined=true;}this._xdDepMap[req]=null;var _59=res.requiresAfter;if(_59&&_59.length>0){var _5a;for(var i=0;i<_59.length;i++){_5a=_59[i].name;if(_5a&&!_56[_5a]){_56.push(_5a);_56[_5a]=true;this._xdEvalReqs(_56);}}}}_56.pop();}};dojo._xdClearInterval=function(){clearInterval(this._xdTimer);this._xdTimer=0;};dojo._xdWatchInFlight=function(){var _5e="";var _5f=(djConfig.xdWaitSeconds||15)*1000;var _60=(this._xdStartTime+_5f)<(new Date()).getTime();for(var _61 in this._xdInFlight){if(this._xdInFlight[_61]===true){if(_60){_5e+=_61+" ";}else{return;}}}this._xdClearInterval();if(_60){throw "Could not load cross-domain resources: "+_5e;}this._xdWalkReqs();var _62=this._xdDefList.length;for(var i=0;i<_62;i++){var _64=dojo._xdDefList[i];if(djConfig["debugAtAllCosts"]&&_64["resourceName"]){if(!this["_xdDebugQueue"]){this._xdDebugQueue=[];}this._xdDebugQueue.push({resourceName:_64.resourceName,resourcePath:_64.resourcePath});}else{_64(dojo);}}for(var i=0;i0){this._xdDebugFileLoaded();}else{this._xdNotifyLoaded();}};dojo._xdNotifyLoaded=function(){this._inFlightCount=0;if(this._initFired&&!this._loadNotifying){this._callLoaded();}};} \ No newline at end of file +if(!dojo._hasResource["dojo._base._loader.loader_xd"]){dojo._hasResource["dojo._base._loader.loader_xd"]=true;dojo.provide("dojo._base._loader.loader_xd");dojo._xdReset=function(){this._isXDomain=dojo.config.useXDomain||false;this._xdTimer=0;this._xdInFlight={};this._xdOrderedReqs=[];this._xdDepMap={};this._xdContents=[];this._xdDefList=[];};dojo._xdReset();dojo._xdCreateResource=function(_1,_2,_3){var _4=_1.replace(/(\/\*([\s\S]*?)\*\/|\/\/(.*)$)/mg,"");var _5=[];var _6=/dojo.(require|requireIf|provide|requireAfterIf|platformRequire|requireLocalization)\s*\(([\w\W]*?)\)/mg;var _7;while((_7=_6.exec(_4))!=null){if(_7[1]=="requireLocalization"){eval(_7[0]);}else{_5.push("\""+_7[1]+"\", "+_7[2]);}}var _8=[];_8.push(dojo._scopeName+"._xdResourceLoaded(function("+dojo._scopePrefixArgs+"){\n");var _9=dojo._xdExtractLoadInits(_1);if(_9){_1=_9[0];for(var i=1;i<_9.length;i++){_8.push(_9[i]+";\n");}}_8.push("return {");if(_5.length>0){_8.push("depends: [");for(i=0;i<_5.length;i++){if(i>0){_8.push(",\n");}_8.push("["+_5[i]+"]");}_8.push("],");}_8.push("\ndefineResource: function("+dojo._scopePrefixArgs+"){");if(!dojo.config["debugAtAllCosts"]||_2=="dojo._base._loader.loader_debug"){_8.push(_1);}_8.push("\n}, resourceName: '"+_2+"', resourcePath: '"+_3+"'};});");return _8.join("");};dojo._xdExtractLoadInits=function(_b){var _c=/dojo.loadInit\s*\(/g;_c.lastIndex=0;var _d=/[\(\)]/g;_d.lastIndex=0;var _e=[];var _f;while((_f=_c.exec(_b))){_d.lastIndex=_c.lastIndex;var _10=1;var _11;while((_11=_d.exec(_b))){if(_11[0]==")"){_10-=1;}else{_10+=1;}if(_10==0){break;}}if(_10!=0){throw "unmatched paren around character "+_d.lastIndex+" in: "+_b;}var _12=_c.lastIndex-_f[0].length;_e.push(_b.substring(_12,_d.lastIndex));var _13=_d.lastIndex-_12;_b=_b.substring(0,_12)+_b.substring(_d.lastIndex,_b.length);_c.lastIndex=_d.lastIndex-_13;_c.lastIndex=_d.lastIndex;}if(_e.length>0){_e.unshift(_b);}return (_e.length?_e:null);};dojo._xdIsXDomainPath=function(_14){var _15=_14.indexOf(":");var _16=_14.indexOf("/");if(_15>0&&_15<_16){return true;}else{var url=this.baseUrl;_15=url.indexOf(":");_16=url.indexOf("/");if(_15>0&&_15<_16&&(!location.host||url.indexOf("http://"+location.host)!=0)){return true;}}return false;};dojo._loadPath=function(_18,_19,cb){var _1b=this._xdIsXDomainPath(_18);this._isXDomain|=_1b;var uri=((_18.charAt(0)=="/"||_18.match(/^\w+:/))?"":this.baseUrl)+_18;try{return ((!_19||this._isXDomain)?this._loadUri(uri,cb,_1b,_19):this._loadUriAndCheck(uri,_19,cb));}catch(e){console.error(e);return false;}};dojo._loadUri=function(uri,cb,_1f,_20){if(this._loadedUrls[uri]){return 1;}if(this._isXDomain&&_20&&_20!="dojo.i18n"){this._xdOrderedReqs.push(_20);if(_1f||uri.indexOf("/nls/")==-1){this._xdInFlight[_20]=true;this._inFlightCount++;}if(!this._xdTimer){if(dojo.isAIR){this._xdTimer=setInterval(function(){dojo._xdWatchInFlight();},100);}else{this._xdTimer=setInterval(dojo._scopeName+"._xdWatchInFlight();",100);}}this._xdStartTime=(new Date()).getTime();}if(_1f){var _21=uri.lastIndexOf(".");if(_21<=0){_21=uri.length-1;}var _22=uri.substring(0,_21)+".xd";if(_21!=uri.length-1){_22+=uri.substring(_21,uri.length);}if(dojo.isAIR){_22=_22.replace("app:/","/");}var _23=document.createElement("script");_23.type="text/javascript";_23.src=_22;if(!this.headElement){this._headElement=document.getElementsByTagName("head")[0];if(!this._headElement){this._headElement=document.getElementsByTagName("html")[0];}}this._headElement.appendChild(_23);}else{var _24=this._getText(uri,null,true);if(_24==null){return 0;}if(this._isXDomain&&uri.indexOf("/nls/")==-1&&_20!="dojo.i18n"){var res=this._xdCreateResource(_24,_20,uri);dojo.eval(res);}else{if(cb){_24="("+_24+")";}else{_24=this._scopePrefix+_24+this._scopeSuffix;}var _26=dojo["eval"](_24+"\r\n//@ sourceURL="+uri);if(cb){cb(_26);}}}this._loadedUrls[uri]=true;this._loadedUrls.push(uri);return true;};dojo._xdResourceLoaded=function(res){res=res.apply(dojo.global,dojo._scopeArgs);var _28=res.depends;var _29=null;var _2a=null;var _2b=[];if(_28&&_28.length>0){var dep=null;var _2d=0;var _2e=false;for(var i=0;i<_28.length;i++){dep=_28[i];if(dep[0]=="provide"){_2b.push(dep[1]);}else{if(!_29){_29=[];}if(!_2a){_2a=[];}var _30=this._xdUnpackDependency(dep);if(_30.requires){_29=_29.concat(_30.requires);}if(_30.requiresAfter){_2a=_2a.concat(_30.requiresAfter);}}var _31=dep[0];var _32=_31.split(".");if(_32.length==2){dojo[_32[0]][_32[1]].apply(dojo[_32[0]],dep.slice(1));}else{dojo[_31].apply(dojo,dep.slice(1));}}if(_2b.length==1&&_2b[0]=="dojo._base._loader.loader_debug"){res.defineResource(dojo);}else{var _33=this._xdContents.push({content:res.defineResource,resourceName:res["resourceName"],resourcePath:res["resourcePath"],isDefined:false})-1;for(i=0;i<_2b.length;i++){this._xdDepMap[_2b[i]]={requires:_29,requiresAfter:_2a,contentIndex:_33};}}for(i=0;i<_2b.length;i++){this._xdInFlight[_2b[i]]=false;}}};dojo._xdLoadFlattenedBundle=function(_34,_35,_36,_37){_36=_36||"root";var _38=dojo.i18n.normalizeLocale(_36).replace("-","_");var _39=[_34,"nls",_35].join(".");var _3a=dojo["provide"](_39);_3a[_38]=_37;var _3b=[_34,_38,_35].join(".");var _3c=dojo._xdBundleMap[_3b];if(_3c){for(var _3d in _3c){_3a[_3d]=_37;}}};dojo._xdInitExtraLocales=function(){var _3e=dojo.config.extraLocale;if(_3e){if(!_3e instanceof Array){_3e=[_3e];}dojo._xdReqLoc=dojo.xdRequireLocalization;dojo.xdRequireLocalization=function(m,b,_41,_42){dojo._xdReqLoc(m,b,_41,_42);if(_41){return;}for(var i=0;i<_3e.length;i++){dojo._xdReqLoc(m,b,_3e[i],_42);}};}};dojo._xdBundleMap={};dojo.xdRequireLocalization=function(_44,_45,_46,_47){if(dojo._xdInitExtraLocales){dojo._xdInitExtraLocales();dojo._xdInitExtraLocales=null;dojo.xdRequireLocalization.apply(dojo,arguments);return;}var _48=_47.split(",");var _49=dojo.i18n.normalizeLocale(_46);var _4a="";for(var i=0;i<_48.length;i++){if(_49.indexOf(_48[i])==0){if(_48[i].length>_4a.length){_4a=_48[i];}}}var _4c=_4a.replace("-","_");var _4d=dojo.getObject([_44,"nls",_45].join("."));if(_4d&&_4d[_4c]){bundle[_49.replace("-","_")]=_4d[_4c];}else{var _4e=[_44,(_4c||"root"),_45].join(".");var _4f=dojo._xdBundleMap[_4e];if(!_4f){_4f=dojo._xdBundleMap[_4e]={};}_4f[_49.replace("-","_")]=true;dojo.require(_44+".nls"+(_4a?"."+_4a:"")+"."+_45);}};dojo._xdRealRequireLocalization=dojo.requireLocalization;dojo.requireLocalization=function(_50,_51,_52,_53){var _54=this.moduleUrl(_50).toString();if(this._xdIsXDomainPath(_54)){return dojo.xdRequireLocalization.apply(dojo,arguments);}else{return dojo._xdRealRequireLocalization.apply(dojo,arguments);}};dojo._xdUnpackDependency=function(dep){var _56=null;var _57=null;switch(dep[0]){case "requireIf":case "requireAfterIf":if(dep[1]===true){_56=[{name:dep[2],content:null}];}break;case "platformRequire":var _58=dep[1];var _59=_58["common"]||[];_56=(_58[dojo.hostenv.name_])?_59.concat(_58[dojo.hostenv.name_]||[]):_59.concat(_58["default"]||[]);if(_56){for(var i=0;i<_56.length;i++){if(_56[i] instanceof Array){_56[i]={name:_56[i][0],content:null};}else{_56[i]={name:_56[i],content:null};}}}break;case "require":_56=[{name:dep[1],content:null}];break;case "i18n._preloadLocalizations":dojo.i18n._preloadLocalizations.apply(dojo.i18n._preloadLocalizations,dep.slice(1));break;}if(dep[0]=="requireAfterIf"||dep[0]=="requireIf"){_57=_56;_56=null;}return {requires:_56,requiresAfter:_57};};dojo._xdWalkReqs=function(){var _5b=null;var req;for(var i=0;i0){var req=_5e[_5e.length-1];var res=this._xdDepMap[req];var i,_62,_63;if(res){_62=res.requires;if(_62&&_62.length>0){for(i=0;i<_62.length;i++){_63=_62[i].name;if(_63&&!_5e[_63]){_5e.push(_63);_5e[_63]=true;this._xdEvalReqs(_5e);}}}var _64=this._xdContents[res.contentIndex];if(!_64.isDefined){var _65=_64.content;_65["resourceName"]=_64["resourceName"];_65["resourcePath"]=_64["resourcePath"];this._xdDefList.push(_65);_64.isDefined=true;}this._xdDepMap[req]=null;_62=res.requiresAfter;if(_62&&_62.length>0){for(i=0;i<_62.length;i++){_63=_62[i].name;if(_63&&!_5e[_63]){_5e.push(_63);_5e[_63]=true;this._xdEvalReqs(_5e);}}}}_5e.pop();}};dojo._xdClearInterval=function(){clearInterval(this._xdTimer);this._xdTimer=0;};dojo._xdWatchInFlight=function(){var _66="";var _67=(dojo.config.xdWaitSeconds||15)*1000;var _68=(this._xdStartTime+_67)<(new Date()).getTime();for(var _69 in this._xdInFlight){if(this._xdInFlight[_69]===true){if(_68){_66+=_69+" ";}else{return;}}}this._xdClearInterval();if(_68){throw "Could not load cross-domain resources: "+_66;}this._xdWalkReqs();var _6a=this._xdDefList.length;for(var i=0;i<_6a;i++){var _6c=dojo._xdDefList[i];if(dojo.config["debugAtAllCosts"]&&_6c["resourceName"]){if(!this["_xdDebugQueue"]){this._xdDebugQueue=[];}this._xdDebugQueue.push({resourceName:_6c.resourceName,resourcePath:_6c.resourcePath});}else{_6c.apply(dojo.global,dojo._scopeArgs);}}for(i=0;i0){this._xdDebugFileLoaded();}else{this._xdNotifyLoaded();}};dojo._xdNotifyLoaded=function(){this._inFlightCount=0;if(this._initFired&&!this._loadNotifying){this._callLoaded();}};} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/_base/array.js b/spring-js/src/main/resources/META-INF/dojo/_base/array.js index 13cc74aa..1a8219be 100644 --- a/spring-js/src/main/resources/META-INF/dojo/_base/array.js +++ b/spring-js/src/main/resources/META-INF/dojo/_base/array.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo._base.array"]){dojo._hasResource["dojo._base.array"]=true;dojo.require("dojo._base.lang");dojo.provide("dojo._base.array");(function(){var _1=function(_2,_3,cb){return [(dojo.isString(_2)?_2.split(""):_2),(_3||dojo.global),(dojo.isString(cb)?(new Function("item","index","array",cb)):cb)];};dojo.mixin(dojo,{indexOf:function(_5,_6,_7,_8){var i=0,_a=1,_b=_5.length;if(_8){i=_b-1;_a=_b=-1;}for(i=_7||i;i!=_b;i+=_a){if(_5[i]==_6){return i;}}return -1;},lastIndexOf:function(_c,_d,_e){return dojo.indexOf(_c,_d,_e,true);},forEach:function(_f,_10,obj){if(!_f||!_f.length){return;}var _p=_1(_f,obj,_10);_f=_p[0];for(var i=0,l=_p[0].length;i_a)||i<_a){for(;i!=_a;i+=_9){if(_5[i]==_6){return i;}}}return -1;},lastIndexOf:function(_c,_d,_e){return dojo.indexOf(_c,_d,_e,true);},forEach:function(_f,_10,_11){if(!_f||!_f.length){return;}var _p=_1(_f,_11,_10);_f=_p[0];for(var i=0,l=_f.length;i= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ diff --git a/spring-js/src/main/resources/META-INF/dojo/_base/connect.js b/spring-js/src/main/resources/META-INF/dojo/_base/connect.js index 8127e19a..8bd4cc28 100644 --- a/spring-js/src/main/resources/META-INF/dojo/_base/connect.js +++ b/spring-js/src/main/resources/META-INF/dojo/_base/connect.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo._base.connect"]){dojo._hasResource["dojo._base.connect"]=true;dojo.provide("dojo._base.connect");dojo.require("dojo._base.lang");dojo._listener={getDispatcher:function(){return function(){var ap=Array.prototype,c=arguments.callee,ls=c._listeners,t=c.target;var r=t&&t.apply(this,arguments);for(var i in ls){if(!(i in ap)){ls[i].apply(this,arguments);}}return r;};},add:function(_7,_8,_9){_7=_7||dojo.global;var f=_7[_8];if(!f||!f._listeners){var d=dojo._listener.getDispatcher();d.target=f;d._listeners=[];f=_7[_8]=d;}return f._listeners.push(_9);},remove:function(_c,_d,_e){var f=(_c||dojo.global)[_d];if(f&&f._listeners&&_e--){delete f._listeners[_e];}}};dojo.connect=function(obj,_11,_12,_13,_14){var a=arguments,_16=[],i=0;_16.push(dojo.isString(a[0])?null:a[i++],a[i++]);var a1=a[i+1];_16.push(dojo.isString(a1)||dojo.isFunction(a1)?a[i++]:null,a[i++]);for(var l=a.length;i= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo._base.declare"]){dojo._hasResource["dojo._base.declare"]=true;dojo.provide("dojo._base.declare");dojo.require("dojo._base.lang");dojo.declare=function(_1,_2,_3){if(dojo.isFunction(_3)||(arguments.length>3)){dojo.deprecated("dojo.declare: for class '"+_1+"' pass initializer function as 'constructor' property instead of as a separate argument.","","1.0");var c=_3;_3=arguments[3]||{};_3.constructor=c;}var dd=arguments.callee,_6=null;if(dojo.isArray(_2)){_6=_2;_2=_6.shift();}if(_6){for(var i=0,m;i<_6.length;i++){m=_6[i];if(!m){throw ("Mixin #"+i+" to declaration of "+_1+" is null. It's likely a required module is not loaded.");}_2=dd._delegate(_2,m);}}var _9=(_3||0).constructor,_a=dd._delegate(_2),fn;for(var i in _3){if(dojo.isFunction(fn=_3[i])&&(!0[i])){fn.nom=i;}}dojo.extend(_a,{declaredClass:_1,_constructor:_9,preamble:null},_3||0);_a.prototype.constructor=_a;return dojo.setObject(_1,_a);};dojo.mixin(dojo.declare,{_delegate:function(_c,_d){var bp=(_c||0).prototype,mp=(_d||0).prototype;var _10=dojo.declare._makeCtor();dojo.mixin(_10,{superclass:bp,mixin:mp,extend:dojo.declare._extend});if(_c){_10.prototype=dojo._delegate(bp);}dojo.extend(_10,dojo.declare._core,mp||0,{_constructor:null,preamble:null});_10.prototype.constructor=_10;_10.prototype.declaredClass=(bp||0).declaredClass+"_"+(mp||0).declaredClass;return _10;},_extend:function(_11){for(var i in _11){if(dojo.isFunction(fn=_11[i])&&(!0[i])){fn.nom=i;}}dojo.extend(this,_11);},_makeCtor:function(){return function(){this._construct(arguments);};},_core:{_construct:function(_13){var c=_13.callee,s=c.superclass,ct=s&&s.constructor,m=c.mixin,mct=m&&m.constructor,a=_13,ii,fn;if(a[0]){if((fn=a[0]["preamble"])){a=fn.apply(this,a)||a;}}if(fn=c.prototype.preamble){a=fn.apply(this,a)||a;}if(ct&&ct.apply){ct.apply(this,a);}if(mct&&mct.apply){mct.apply(this,a);}if(ii=c.prototype._constructor){ii.apply(this,_13);}if(this.constructor.prototype==c.prototype&&(ct=this.postscript)){ct.apply(this,_13);}},_findMixin:function(_1c){var c=this.constructor,p,m;while(c){p=c.superclass;m=c.mixin;if(m==_1c||(m instanceof _1c.constructor)){return p;}if(m&&(m=m._findMixin(_1c))){return m;}c=p&&p.constructor;}},_findMethod:function(_20,_21,_22,has){var p=_22,c,m,f;do{c=p.constructor;m=c.mixin;if(m&&(m=this._findMethod(_20,_21,m,has))){return m;}if((f=p[_20])&&(has==(f==_21))){return p;}p=c.superclass;}while(p);return !has&&(p=this._findMixin(_22))&&this._findMethod(_20,_21,p,has);},inherited:function(_28,_29,_2a){var a=arguments;if(!dojo.isString(a[0])){_2a=_29;_29=_28;_28=_29.callee.nom;}var c=_29.callee,p=this.constructor.prototype,a=_2a||_29,fn,mp;if(this[_28]!=c||p[_28]==c){mp=this._findMethod(_28,c,p,true);if(!mp){throw (this.declaredClass+": name argument (\""+_28+"\") to inherited must match callee (declare.js)");}p=this._findMethod(_28,c,mp,false);}fn=p&&p[_28];if(!fn){console.debug(mp.declaredClass+": no inherited \""+_28+"\" was found (declare.js)");return;}return fn.apply(this,a);}}});} \ No newline at end of file +if(!dojo._hasResource["dojo._base.declare"]){dojo._hasResource["dojo._base.declare"]=true;dojo.provide("dojo._base.declare");dojo.require("dojo._base.lang");dojo.declare=function(_1,_2,_3){var dd=arguments.callee,_5;if(dojo.isArray(_2)){_5=_2;_2=_5.shift();}if(_5){dojo.forEach(_5,function(m){if(!m){throw (_1+": mixin #"+i+" is null");}_2=dd._delegate(_2,m);});}var _7=dd._delegate(_2);_3=_3||{};_7.extend(_3);dojo.extend(_7,{declaredClass:_1,_constructor:_3.constructor});_7.prototype.constructor=_7;return dojo.setObject(_1,_7);};dojo.mixin(dojo.declare,{_delegate:function(_8,_9){var bp=(_8||0).prototype,mp=(_9||0).prototype,dd=dojo.declare;var _d=dd._makeCtor();dojo.mixin(_d,{superclass:bp,mixin:mp,extend:dd._extend});if(_8){_d.prototype=dojo._delegate(bp);}dojo.extend(_d,dd._core,mp||0,{_constructor:null,preamble:null});_d.prototype.constructor=_d;_d.prototype.declaredClass=(bp||0).declaredClass+"_"+(mp||0).declaredClass;return _d;},_extend:function(_e){var i,fn;for(i in _e){if(dojo.isFunction(fn=_e[i])&&!0[i]){fn.nom=i;fn.ctor=this;}}dojo.extend(this,_e);},_makeCtor:function(){return function(){this._construct(arguments);};},_core:{_construct:function(_11){var c=_11.callee,s=c.superclass,ct=s&&s.constructor,m=c.mixin,mct=m&&m.constructor,a=_11,ii,fn;if(a[0]){if(((fn=a[0].preamble))){a=fn.apply(this,a)||a;}}if((fn=c.prototype.preamble)){a=fn.apply(this,a)||a;}if(ct&&ct.apply){ct.apply(this,a);}if(mct&&mct.apply){mct.apply(this,a);}if((ii=c.prototype._constructor)){ii.apply(this,_11);}if(this.constructor.prototype==c.prototype&&(ct=this.postscript)){ct.apply(this,_11);}},_findMixin:function(_1a){var c=this.constructor,p,m;while(c){p=c.superclass;m=c.mixin;if(m==_1a||(m instanceof _1a.constructor)){return p;}if(m&&m._findMixin&&(m=m._findMixin(_1a))){return m;}c=p&&p.constructor;}},_findMethod:function(_1e,_1f,_20,has){var p=_20,c,m,f;do{c=p.constructor;m=c.mixin;if(m&&(m=this._findMethod(_1e,_1f,m,has))){return m;}if((f=p[_1e])&&(has==(f==_1f))){return p;}p=c.superclass;}while(p);return !has&&(p=this._findMixin(_20))&&this._findMethod(_1e,_1f,p,has);},inherited:function(_26,_27,_28){var a=arguments;if(!dojo.isString(a[0])){_28=_27;_27=_26;_26=_27.callee.nom;}a=_28||_27;var c=_27.callee,p=this.constructor.prototype,fn,mp;if(this[_26]!=c||p[_26]==c){mp=(c.ctor||0).superclass||this._findMethod(_26,c,p,true);if(!mp){throw (this.declaredClass+": inherited method \""+_26+"\" mismatch");}p=this._findMethod(_26,c,mp,false);}fn=p&&p[_26];if(!fn){throw (mp.declaredClass+": inherited method \""+_26+"\" not found");}return fn.apply(this,a);}}});} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/_base/event.js b/spring-js/src/main/resources/META-INF/dojo/_base/event.js index 7b8452d3..8ec5025d 100644 --- a/spring-js/src/main/resources/META-INF/dojo/_base/event.js +++ b/spring-js/src/main/resources/META-INF/dojo/_base/event.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo._base.event"]){dojo._hasResource["dojo._base.event"]=true;dojo.provide("dojo._base.event");dojo.require("dojo._base.connect");(function(){var _1=dojo._event_listener={add:function(_2,_3,fp){if(!_2){return;}_3=_1._normalizeEventName(_3);fp=_1._fixCallback(_3,fp);var _5=_3;if((!dojo.isIE)&&((_3=="mouseenter")||(_3=="mouseleave"))){var _5=_3;var _6=fp;_3=(_3=="mouseenter")?"mouseover":"mouseout";fp=function(e){var id=dojo.isDescendant(e.relatedTarget,_2);if(id==false){return _6.call(this,e);}};}_2.addEventListener(_3,fp,false);return fp;},remove:function(_9,_a,_b){(_9)&&(_9.removeEventListener(_1._normalizeEventName(_a),_b,false));},_normalizeEventName:function(_c){return (_c.slice(0,2)=="on"?_c.slice(2):_c);},_fixCallback:function(_d,fp){return (_d!="keypress"?fp:function(e){return fp.call(this,_1._fixEvent(e,this));});},_fixEvent:function(evt,_11){switch(evt.type){case "keypress":_1._setKeyChar(evt);break;}return evt;},_setKeyChar:function(evt){evt.keyChar=(evt.charCode?String.fromCharCode(evt.charCode):"");}};dojo.fixEvent=function(evt,_14){return _1._fixEvent(evt,_14);};dojo.stopEvent=function(evt){evt.preventDefault();evt.stopPropagation();};var _16=dojo._listener;dojo._connect=function(obj,_18,_19,_1a,_1b){var _1c=obj&&(obj.nodeType||obj.attachEvent||obj.addEventListener);var lid=!_1c?0:(!_1b?1:2),l=[dojo._listener,_1,_16][lid];var h=l.add(obj,_18,dojo.hitch(_19,_1a));return [obj,_18,h,lid];};dojo._disconnect=function(obj,_21,_22,_23){([dojo._listener,_1,_16][_23]).remove(obj,_21,_22);};dojo.keys={BACKSPACE:8,TAB:9,CLEAR:12,ENTER:13,SHIFT:16,CTRL:17,ALT:18,PAUSE:19,CAPS_LOCK:20,ESCAPE:27,SPACE:32,PAGE_UP:33,PAGE_DOWN:34,END:35,HOME:36,LEFT_ARROW:37,UP_ARROW:38,RIGHT_ARROW:39,DOWN_ARROW:40,INSERT:45,DELETE:46,HELP:47,LEFT_WINDOW:91,RIGHT_WINDOW:92,SELECT:93,NUMPAD_0:96,NUMPAD_1:97,NUMPAD_2:98,NUMPAD_3:99,NUMPAD_4:100,NUMPAD_5:101,NUMPAD_6:102,NUMPAD_7:103,NUMPAD_8:104,NUMPAD_9:105,NUMPAD_MULTIPLY:106,NUMPAD_PLUS:107,NUMPAD_ENTER:108,NUMPAD_MINUS:109,NUMPAD_PERIOD:110,NUMPAD_DIVIDE:111,F1:112,F2:113,F3:114,F4:115,F5:116,F6:117,F7:118,F8:119,F9:120,F10:121,F11:122,F12:123,F13:124,F14:125,F15:126,NUM_LOCK:144,SCROLL_LOCK:145};if(dojo.isIE){var _24=function(e,_26){try{return (e.keyCode=_26);}catch(e){return 0;}};var iel=dojo._listener;if(!djConfig._allow_leaks){_16=iel=dojo._ie_listener={handlers:[],add:function(_28,_29,_2a){_28=_28||dojo.global;var f=_28[_29];if(!f||!f._listeners){var d=dojo._getIeDispatcher();d.target=f&&(ieh.push(f)-1);d._listeners=[];f=_28[_29]=d;}return f._listeners.push(ieh.push(_2a)-1);},remove:function(_2e,_2f,_30){var f=(_2e||dojo.global)[_2f],l=f&&f._listeners;if(f&&l&&_30--){delete ieh[l[_30]];delete l[_30];}}};var ieh=iel.handlers;}dojo.mixin(_1,{add:function(_33,_34,fp){if(!_33){return;}_34=_1._normalizeEventName(_34);if(_34=="onkeypress"){var kd=_33.onkeydown;if(!kd||!kd._listeners||!kd._stealthKeydown){_1.add(_33,"onkeydown",_1._stealthKeyDown);_33.onkeydown._stealthKeydown=true;}}return iel.add(_33,_34,_1._fixCallback(fp));},remove:function(_37,_38,_39){iel.remove(_37,_1._normalizeEventName(_38),_39);},_normalizeEventName:function(_3a){return (_3a.slice(0,2)!="on"?"on"+_3a:_3a);},_nop:function(){},_fixEvent:function(evt,_3c){if(!evt){var w=(_3c)&&((_3c.ownerDocument||_3c.document||_3c).parentWindow)||window;evt=w.event;}if(!evt){return (evt);}evt.target=evt.srcElement;evt.currentTarget=(_3c||evt.srcElement);evt.layerX=evt.offsetX;evt.layerY=evt.offsetY;var se=evt.srcElement,doc=(se&&se.ownerDocument)||document;var _40=((dojo.isIE<6)||(doc["compatMode"]=="BackCompat"))?doc.body:doc.documentElement;var _41=dojo._getIeDocumentElementOffset();evt.pageX=evt.clientX+dojo._fixIeBiDiScrollLeft(_40.scrollLeft||0)-_41.x;evt.pageY=evt.clientY+(_40.scrollTop||0)-_41.y;if(evt.type=="mouseover"){evt.relatedTarget=evt.fromElement;}if(evt.type=="mouseout"){evt.relatedTarget=evt.toElement;}evt.stopPropagation=_1._stopPropagation;evt.preventDefault=_1._preventDefault;return _1._fixKeys(evt);},_fixKeys:function(evt){switch(evt.type){case "keypress":var c=("charCode" in evt?evt.charCode:evt.keyCode);if(c==10){c=0;evt.keyCode=13;}else{if(c==13||c==27){c=0;}else{if(c==3){c=99;}}}evt.charCode=c;_1._setKeyChar(evt);break;}return evt;},_punctMap:{106:42,111:47,186:59,187:43,188:44,189:45,190:46,191:47,192:96,219:91,220:92,221:93,222:39},_stealthKeyDown:function(evt){var kp=evt.currentTarget.onkeypress;if(!kp||!kp._listeners){return;}var k=evt.keyCode;var _47=(k!=13)&&(k!=32)&&(k!=27)&&(k<48||k>90)&&(k<96||k>111)&&(k<186||k>192)&&(k<219||k>222);if(_47||evt.ctrlKey){var c=(_47?0:k);if(evt.ctrlKey){if(k==3||k==13){return;}else{if(c>95&&c<106){c-=48;}else{if((!evt.shiftKey)&&(c>=65&&c<=90)){c+=32;}else{c=_1._punctMap[c]||c;}}}}var _49=_1._synthesizeEvent(evt,{type:"keypress",faux:true,charCode:c});kp.call(evt.currentTarget,_49);evt.cancelBubble=_49.cancelBubble;evt.returnValue=_49.returnValue;_24(evt,_49.keyCode);}},_stopPropagation:function(){this.cancelBubble=true;},_preventDefault:function(){this.bubbledKeyCode=this.keyCode;if(this.ctrlKey){_24(this,0);}this.returnValue=false;}});dojo.stopEvent=function(evt){evt=evt||window.event;_1._stopPropagation.call(evt);_1._preventDefault.call(evt);};}_1._synthesizeEvent=function(evt,_4c){var _4d=dojo.mixin({},evt,_4c);_1._setKeyChar(_4d);_4d.preventDefault=function(){evt.preventDefault();};_4d.stopPropagation=function(){evt.stopPropagation();};return _4d;};if(dojo.isOpera){dojo.mixin(_1,{_fixEvent:function(evt,_4f){switch(evt.type){case "keypress":var c=evt.which;if(c==3){c=99;}c=((c<41)&&(!evt.shiftKey)?0:c);if((evt.ctrlKey)&&(!evt.shiftKey)&&(c>=65)&&(c<=90)){c+=32;}return _1._synthesizeEvent(evt,{charCode:c});}return evt;}});}if(dojo.isSafari){dojo.mixin(_1,{_fixEvent:function(evt,_52){switch(evt.type){case "keypress":var c=evt.charCode,s=evt.shiftKey,k=evt.keyCode;k=k||_56[evt.keyIdentifier]||0;if(evt.keyIdentifier=="Enter"){c=0;}else{if((evt.ctrlKey)&&(c>0)&&(c<27)){c+=96;}else{if(c==dojo.keys.SHIFT_TAB){c=dojo.keys.TAB;s=true;}else{c=(c>=32&&c<63232?c:0);}}}return _1._synthesizeEvent(evt,{charCode:c,shiftKey:s,keyCode:k});}return evt;}});dojo.mixin(dojo.keys,{SHIFT_TAB:25,UP_ARROW:63232,DOWN_ARROW:63233,LEFT_ARROW:63234,RIGHT_ARROW:63235,F1:63236,F2:63237,F3:63238,F4:63239,F5:63240,F6:63241,F7:63242,F8:63243,F9:63244,F10:63245,F11:63246,F12:63247,PAUSE:63250,DELETE:63272,HOME:63273,END:63275,PAGE_UP:63276,PAGE_DOWN:63277,INSERT:63302,PRINT_SCREEN:63248,SCROLL_LOCK:63249,NUM_LOCK:63289});var dk=dojo.keys,_56={"Up":dk.UP_ARROW,"Down":dk.DOWN_ARROW,"Left":dk.LEFT_ARROW,"Right":dk.RIGHT_ARROW,"PageUp":dk.PAGE_UP,"PageDown":dk.PAGE_DOWN};}})();if(dojo.isIE){dojo._getIeDispatcher=function(){return function(){var ap=Array.prototype,h=dojo._ie_listener.handlers,c=arguments.callee,ls=c._listeners,t=h[c.target];var r=t&&t.apply(this,arguments);for(var i in ls){if(!(i in ap)){h[ls[i]].apply(this,arguments);}}return r;};};dojo._event_listener._fixCallback=function(fp){var f=dojo._event_listener._fixEvent;return function(e){return fp.call(this,f(e,this));};};}} \ No newline at end of file +if(!dojo._hasResource["dojo._base.event"]){dojo._hasResource["dojo._base.event"]=true;dojo.provide("dojo._base.event");dojo.require("dojo._base.connect");(function(){var _1=(dojo._event_listener={add:function(_2,_3,fp){if(!_2){return;}_3=_1._normalizeEventName(_3);fp=_1._fixCallback(_3,fp);var _5=_3;if(!dojo.isIE&&(_3=="mouseenter"||_3=="mouseleave")){var _6=fp;_3=(_3=="mouseenter")?"mouseover":"mouseout";fp=function(e){try{e.relatedTarget.tagName;}catch(e2){return;}if(!dojo.isDescendant(e.relatedTarget,_2)){return _6.call(this,e);}};}_2.addEventListener(_3,fp,false);return fp;},remove:function(_8,_9,_a){if(_8){_9=_1._normalizeEventName(_9);if(!dojo.isIE&&(_9=="mouseenter"||_9=="mouseleave")){_9=(_9=="mouseenter")?"mouseover":"mouseout";}_8.removeEventListener(_9,_a,false);}},_normalizeEventName:function(_b){return _b.slice(0,2)=="on"?_b.slice(2):_b;},_fixCallback:function(_c,fp){return _c!="keypress"?fp:function(e){return fp.call(this,_1._fixEvent(e,this));};},_fixEvent:function(_f,_10){switch(_f.type){case "keypress":_1._setKeyChar(_f);break;}return _f;},_setKeyChar:function(evt){evt.keyChar=evt.charCode?String.fromCharCode(evt.charCode):"";evt.charOrCode=evt.keyChar||evt.keyCode;},_punctMap:{106:42,111:47,186:59,187:43,188:44,189:45,190:46,191:47,192:96,219:91,220:92,221:93,222:39}});dojo.fixEvent=function(evt,_13){return _1._fixEvent(evt,_13);};dojo.stopEvent=function(evt){evt.preventDefault();evt.stopPropagation();};var _15=dojo._listener;dojo._connect=function(obj,_17,_18,_19,_1a){var _1b=obj&&(obj.nodeType||obj.attachEvent||obj.addEventListener);var lid=!_1b?0:(!_1a?1:2),l=[dojo._listener,_1,_15][lid];var h=l.add(obj,_17,dojo.hitch(_18,_19));return [obj,_17,h,lid];};dojo._disconnect=function(obj,_20,_21,_22){([dojo._listener,_1,_15][_22]).remove(obj,_20,_21);};dojo.keys={BACKSPACE:8,TAB:9,CLEAR:12,ENTER:13,SHIFT:16,CTRL:17,ALT:18,PAUSE:19,CAPS_LOCK:20,ESCAPE:27,SPACE:32,PAGE_UP:33,PAGE_DOWN:34,END:35,HOME:36,LEFT_ARROW:37,UP_ARROW:38,RIGHT_ARROW:39,DOWN_ARROW:40,INSERT:45,DELETE:46,HELP:47,LEFT_WINDOW:91,RIGHT_WINDOW:92,SELECT:93,NUMPAD_0:96,NUMPAD_1:97,NUMPAD_2:98,NUMPAD_3:99,NUMPAD_4:100,NUMPAD_5:101,NUMPAD_6:102,NUMPAD_7:103,NUMPAD_8:104,NUMPAD_9:105,NUMPAD_MULTIPLY:106,NUMPAD_PLUS:107,NUMPAD_ENTER:108,NUMPAD_MINUS:109,NUMPAD_PERIOD:110,NUMPAD_DIVIDE:111,F1:112,F2:113,F3:114,F4:115,F5:116,F6:117,F7:118,F8:119,F9:120,F10:121,F11:122,F12:123,F13:124,F14:125,F15:126,NUM_LOCK:144,SCROLL_LOCK:145};if(dojo.isIE){var _23=function(e,_25){try{return (e.keyCode=_25);}catch(e){return 0;}};var iel=dojo._listener;var _27=dojo._ieListenersName="_"+dojo._scopeName+"_listeners";if(!dojo.config._allow_leaks){_15=iel=dojo._ie_listener={handlers:[],add:function(_28,_29,_2a){_28=_28||dojo.global;var f=_28[_29];if(!f||!f[_27]){var d=dojo._getIeDispatcher();d.target=f&&(ieh.push(f)-1);d[_27]=[];f=_28[_29]=d;}return f[_27].push(ieh.push(_2a)-1);},remove:function(_2e,_2f,_30){var f=(_2e||dojo.global)[_2f],l=f&&f[_27];if(f&&l&&_30--){delete ieh[l[_30]];delete l[_30];}}};var ieh=iel.handlers;}dojo.mixin(_1,{add:function(_33,_34,fp){if(!_33){return;}_34=_1._normalizeEventName(_34);if(_34=="onkeypress"){var kd=_33.onkeydown;if(!kd||!kd[_27]||!kd._stealthKeydownHandle){var h=_1.add(_33,"onkeydown",_1._stealthKeyDown);kd=_33.onkeydown;kd._stealthKeydownHandle=h;kd._stealthKeydownRefs=1;}else{kd._stealthKeydownRefs++;}}return iel.add(_33,_34,_1._fixCallback(fp));},remove:function(_38,_39,_3a){_39=_1._normalizeEventName(_39);iel.remove(_38,_39,_3a);if(_39=="onkeypress"){var kd=_38.onkeydown;if(--kd._stealthKeydownRefs<=0){iel.remove(_38,"onkeydown",kd._stealthKeydownHandle);delete kd._stealthKeydownHandle;}}},_normalizeEventName:function(_3c){return _3c.slice(0,2)!="on"?"on"+_3c:_3c;},_nop:function(){},_fixEvent:function(evt,_3e){if(!evt){var w=_3e&&(_3e.ownerDocument||_3e.document||_3e).parentWindow||window;evt=w.event;}if(!evt){return (evt);}evt.target=evt.srcElement;evt.currentTarget=(_3e||evt.srcElement);evt.layerX=evt.offsetX;evt.layerY=evt.offsetY;var se=evt.srcElement,doc=(se&&se.ownerDocument)||document;var _42=((dojo.isIE<6)||(doc["compatMode"]=="BackCompat"))?doc.body:doc.documentElement;var _43=dojo._getIeDocumentElementOffset();evt.pageX=evt.clientX+dojo._fixIeBiDiScrollLeft(_42.scrollLeft||0)-_43.x;evt.pageY=evt.clientY+(_42.scrollTop||0)-_43.y;if(evt.type=="mouseover"){evt.relatedTarget=evt.fromElement;}if(evt.type=="mouseout"){evt.relatedTarget=evt.toElement;}evt.stopPropagation=_1._stopPropagation;evt.preventDefault=_1._preventDefault;return _1._fixKeys(evt);},_fixKeys:function(evt){switch(evt.type){case "keypress":var c=("charCode" in evt?evt.charCode:evt.keyCode);if(c==10){c=0;evt.keyCode=13;}else{if(c==13||c==27){c=0;}else{if(c==3){c=99;}}}evt.charCode=c;_1._setKeyChar(evt);break;}return evt;},_stealthKeyDown:function(evt){var kp=evt.currentTarget.onkeypress;if(!kp||!kp[_27]){return;}var k=evt.keyCode;var _49=(k!=13)&&(k!=32)&&(k!=27)&&(k<48||k>90)&&(k<96||k>111)&&(k<186||k>192)&&(k<219||k>222);if(_49||evt.ctrlKey){var c=_49?0:k;if(evt.ctrlKey){if(k==3||k==13){return;}else{if(c>95&&c<106){c-=48;}else{if((!evt.shiftKey)&&(c>=65&&c<=90)){c+=32;}else{c=_1._punctMap[c]||c;}}}}var _4b=_1._synthesizeEvent(evt,{type:"keypress",faux:true,charCode:c});kp.call(evt.currentTarget,_4b);evt.cancelBubble=_4b.cancelBubble;evt.returnValue=_4b.returnValue;_23(evt,_4b.keyCode);}},_stopPropagation:function(){this.cancelBubble=true;},_preventDefault:function(){this.bubbledKeyCode=this.keyCode;if(this.ctrlKey){_23(this,0);}this.returnValue=false;}});dojo.stopEvent=function(evt){evt=evt||window.event;_1._stopPropagation.call(evt);_1._preventDefault.call(evt);};}_1._synthesizeEvent=function(evt,_4e){var _4f=dojo.mixin({},evt,_4e);_1._setKeyChar(_4f);_4f.preventDefault=function(){evt.preventDefault();};_4f.stopPropagation=function(){evt.stopPropagation();};return _4f;};if(dojo.isOpera){dojo.mixin(_1,{_fixEvent:function(evt,_51){switch(evt.type){case "keypress":var c=evt.which;if(c==3){c=99;}c=((c<41)&&(!evt.shiftKey)?0:c);if((evt.ctrlKey)&&(!evt.shiftKey)&&(c>=65)&&(c<=90)){c+=32;}return _1._synthesizeEvent(evt,{charCode:c});}return evt;}});}if(dojo.isSafari){_1._add=_1.add;_1._remove=_1.remove;dojo.mixin(_1,{add:function(_53,_54,fp){if(!_53){return;}var _56=_1._add(_53,_54,fp);if(_1._normalizeEventName(_54)=="keypress"){_56._stealthKeyDownHandle=_1._add(_53,"keydown",function(evt){var k=evt.keyCode;var _59=(k!=13)&&(k!=32)&&(k!=27)&&(k<48||k>90)&&(k<96||k>111)&&(k<186||k>192)&&(k<219||k>222);if(_59||evt.ctrlKey){var c=_59?0:k;if(evt.ctrlKey){if(k==3||k==13){return;}else{if(c>95&&c<106){c-=48;}else{if((!evt.shiftKey)&&(c>=65&&c<=90)){c+=32;}else{c=_1._punctMap[c]||c;}}}}var _5b=_1._synthesizeEvent(evt,{type:"keypress",faux:true,charCode:c});fp.call(evt.currentTarget,_5b);}});}return _56;},remove:function(_5c,_5d,_5e){if(_5c){if(_5e._stealthKeyDownHandle){_1._remove(_5c,"keydown",_5e._stealthKeyDownHandle);}_1._remove(_5c,_5d,_5e);}},_fixEvent:function(evt,_60){switch(evt.type){case "keypress":if(evt.faux){return evt;}var c=evt.charCode;c=c>=32?c:0;return _1._synthesizeEvent(evt,{charCode:c,faux:true});}return evt;}});}})();if(dojo.isIE){dojo._ieDispatcher=function(_62,_63){var ap=Array.prototype,h=dojo._ie_listener.handlers,c=_62.callee,ls=c[dojo._ieListenersName],t=h[c.target];var r=t&&t.apply(_63,_62);var lls=[].concat(ls);for(var i in lls){if(!(i in ap)){h[lls[i]].apply(_63,_62);}}return r;};dojo._getIeDispatcher=function(){return new Function(dojo._scopeName+"._ieDispatcher(arguments, this)");};dojo._event_listener._fixCallback=function(fp){var f=dojo._event_listener._fixEvent;return function(e){return fp.call(this,f(e,this));};};}} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/_base/fx.js b/spring-js/src/main/resources/META-INF/dojo/_base/fx.js index a5a22a61..ae6bf8f4 100644 --- a/spring-js/src/main/resources/META-INF/dojo/_base/fx.js +++ b/spring-js/src/main/resources/META-INF/dojo/_base/fx.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo._base.fx"]){dojo._hasResource["dojo._base.fx"]=true;dojo.provide("dojo._base.fx");dojo.require("dojo._base.Color");dojo.require("dojo._base.connect");dojo.require("dojo._base.declare");dojo.require("dojo._base.lang");dojo.require("dojo._base.html");dojo._Line=function(_1,_2){this.start=_1;this.end=_2;this.getValue=function(n){return ((this.end-this.start)*n)+this.start;};};dojo.declare("dojo._Animation",null,{constructor:function(_4){dojo.mixin(this,_4);if(dojo.isArray(this.curve)){this.curve=new dojo._Line(this.curve[0],this.curve[1]);}},duration:1000,repeat:0,rate:10,_percent:0,_startRepeatCount:0,fire:function(_5,_6){if(this[_5]){this[_5].apply(this,_6||[]);}return this;},play:function(_7,_8){var _t=this;if(_8){_t._stopTimer();_t._active=_t._paused=false;_t._percent=0;}else{if(_t._active&&!_t._paused){return _t;}}_t.fire("beforeBegin");var d=_7||_t.delay;var _p=dojo.hitch(_t,"_play",_8);if(d>0){setTimeout(_p,d);return _t;}_p();return _t;},_play:function(_c){var _t=this;_t._startTime=new Date().valueOf();if(_t._paused){_t._startTime-=_t.duration*_t._percent;}_t._endTime=_t._startTime+_t.duration;_t._active=true;_t._paused=false;var _e=_t.curve.getValue(_t._percent);if(!_t._percent){if(!_t._startRepeatCount){_t._startRepeatCount=_t.repeat;}_t.fire("onBegin",[_e]);}_t.fire("onPlay",[_e]);_t._cycle();return _t;},pause:function(){this._stopTimer();if(!this._active){return this;}this._paused=true;this.fire("onPause",[this.curve.getValue(this._percent)]);return this;},gotoPercent:function(_f,_10){this._stopTimer();this._active=this._paused=true;this._percent=_f;if(_10){this.play();}return this;},stop:function(_11){if(!this._timer){return;}this._stopTimer();if(_11){this._percent=1;}this.fire("onStop",[this.curve.getValue(this._percent)]);this._active=this._paused=false;return this;},status:function(){if(this._active){return this._paused?"paused":"playing";}return "stopped";},_cycle:function(){var _t=this;if(_t._active){var _13=new Date().valueOf();var _14=(_13-_t._startTime)/(_t._endTime-_t._startTime);if(_14>=1){_14=1;}_t._percent=_14;if(_t.easing){_14=_t.easing(_14);}_t.fire("onAnimate",[_t.curve.getValue(_14)]);if(_14<1){_t._startTimer();}else{_t._active=false;if(_t.repeat>0){_t.repeat--;_t.play(null,true);}else{if(_t.repeat==-1){_t.play(null,true);}else{if(_t._startRepeatCount){_t.repeat=_t._startRepeatCount;_t._startRepeatCount=0;}}}_t._percent=0;_t.fire("onEnd");}}return _t;}});(function(){var d=dojo;var ctr=0;var _17=[];var _18={run:function(){}};var _19=null;dojo._Animation.prototype._startTimer=function(){if(!this._timer){this._timer=dojo.connect(_18,"run",this,"_cycle");ctr++;}if(!_19){_19=setInterval(dojo.hitch(_18,"run"),this.rate);}};dojo._Animation.prototype._stopTimer=function(){dojo.disconnect(this._timer);this._timer=null;ctr--;if(!ctr){clearInterval(_19);_19=null;}};var _1a=(d.isIE)?function(_1b){var ns=_1b.style;if(!ns.zoom.length&&d.style(_1b,"zoom")=="normal"){ns.zoom="1";}if(!ns.width.length&&d.style(_1b,"width")=="auto"){ns.width="auto";}}:function(){};dojo._fade=function(_1d){_1d.node=d.byId(_1d.node);var _1e=d.mixin({properties:{}},_1d);var _1f=(_1e.properties.opacity={});_1f.start=!("start" in _1e)?function(){return Number(d.style(_1e.node,"opacity"));}:_1e.start;_1f.end=_1e.end;var _20=d.animateProperty(_1e);d.connect(_20,"beforeBegin",d.partial(_1a,_1e.node));return _20;};dojo.fadeIn=function(_21){return d._fade(d.mixin({end:1},_21));};dojo.fadeOut=function(_22){return d._fade(d.mixin({end:0},_22));};dojo._defaultEasing=function(n){return 0.5+((Math.sin((n+1.5)*Math.PI))/2);};var _24=function(_25){this._properties=_25;for(var p in _25){var _27=_25[p];if(_27.start instanceof d.Color){_27.tempColor=new d.Color();}}this.getValue=function(r){var ret={};for(var p in this._properties){var _2b=this._properties[p];var _2c=_2b.start;if(_2c instanceof d.Color){ret[p]=d.blendColors(_2c,_2b.end,r,_2b.tempColor).toCss();}else{if(!d.isArray(_2c)){ret[p]=((_2b.end-_2c)*r)+_2c+(p!="opacity"?_2b.units||"px":"");}}}return ret;};};dojo.animateProperty=function(_2d){_2d.node=d.byId(_2d.node);if(!_2d.easing){_2d.easing=d._defaultEasing;}var _2e=new d._Animation(_2d);d.connect(_2e,"beforeBegin",_2e,function(){var pm={};for(var p in this.properties){var _31=(pm[p]=d.mixin({},this.properties[p]));if(d.isFunction(_31.start)){_31.start=_31.start();}if(d.isFunction(_31.end)){_31.end=_31.end();}var _32=(p.toLowerCase().indexOf("color")>=0);function getStyle(_33,p){var v=({height:_33.offsetHeight,width:_33.offsetWidth})[p];if(v!==undefined){return v;}v=d.style(_33,p);return (p=="opacity")?Number(v):parseFloat(v);};if(!("end" in _31)){_31.end=getStyle(this.node,p);}else{if(!("start" in _31)){_31.start=getStyle(this.node,p);}}if(_32){_31.start=new d.Color(_31.start);_31.end=new d.Color(_31.end);}else{_31.start=(p=="opacity")?Number(_31.start):parseFloat(_31.start);}}this.curve=new _24(pm);});d.connect(_2e,"onAnimate",_2e,function(_36){for(var s in _36){d.style(this.node,s,_36[s]);}});return _2e;};})();} \ No newline at end of file +if(!dojo._hasResource["dojo._base.fx"]){dojo._hasResource["dojo._base.fx"]=true;dojo.provide("dojo._base.fx");dojo.require("dojo._base.Color");dojo.require("dojo._base.connect");dojo.require("dojo._base.declare");dojo.require("dojo._base.lang");dojo.require("dojo._base.html");(function(){var d=dojo;dojo._Line=function(_2,_3){this.start=_2;this.end=_3;this.getValue=function(n){return ((this.end-this.start)*n)+this.start;};};d.declare("dojo._Animation",null,{constructor:function(_5){d.mixin(this,_5);if(d.isArray(this.curve)){this.curve=new d._Line(this.curve[0],this.curve[1]);}},duration:350,repeat:0,rate:10,_percent:0,_startRepeatCount:0,_fire:function(_6,_7){if(this[_6]){if(dojo.config.isDebug){this[_6].apply(this,_7||[]);}else{try{this[_6].apply(this,_7||[]);}catch(e){console.error("exception in animation handler for:",_6);console.error(e);}}}return this;},play:function(_8,_9){var _t=this;if(_9){_t._stopTimer();_t._active=_t._paused=false;_t._percent=0;}else{if(_t._active&&!_t._paused){return _t;}}_t._fire("beforeBegin");var de=_8||_t.delay;var _p=dojo.hitch(_t,"_play",_9);if(de>0){setTimeout(_p,de);return _t;}_p();return _t;},_play:function(_d){var _t=this;_t._startTime=new Date().valueOf();if(_t._paused){_t._startTime-=_t.duration*_t._percent;}_t._endTime=_t._startTime+_t.duration;_t._active=true;_t._paused=false;var _f=_t.curve.getValue(_t._percent);if(!_t._percent){if(!_t._startRepeatCount){_t._startRepeatCount=_t.repeat;}_t._fire("onBegin",[_f]);}_t._fire("onPlay",[_f]);_t._cycle();return _t;},pause:function(){this._stopTimer();if(!this._active){return this;}this._paused=true;this._fire("onPause",[this.curve.getValue(this._percent)]);return this;},gotoPercent:function(_10,_11){this._stopTimer();this._active=this._paused=true;this._percent=_10;if(_11){this.play();}return this;},stop:function(_12){if(!this._timer){return this;}this._stopTimer();if(_12){this._percent=1;}this._fire("onStop",[this.curve.getValue(this._percent)]);this._active=this._paused=false;return this;},status:function(){if(this._active){return this._paused?"paused":"playing";}return "stopped";},_cycle:function(){var _t=this;if(_t._active){var _14=new Date().valueOf();var _15=(_14-_t._startTime)/(_t._endTime-_t._startTime);if(_15>=1){_15=1;}_t._percent=_15;if(_t.easing){_15=_t.easing(_15);}_t._fire("onAnimate",[_t.curve.getValue(_15)]);if(_t._percent<1){_t._startTimer();}else{_t._active=false;if(_t.repeat>0){_t.repeat--;_t.play(null,true);}else{if(_t.repeat==-1){_t.play(null,true);}else{if(_t._startRepeatCount){_t.repeat=_t._startRepeatCount;_t._startRepeatCount=0;}}}_t._percent=0;_t._fire("onEnd");_t._stopTimer();}}return _t;}});var ctr=0;var _17=[];var _18={run:function(){}};var _19=null;dojo._Animation.prototype._startTimer=function(){if(!this._timer){this._timer=d.connect(_18,"run",this,"_cycle");ctr++;}if(!_19){_19=setInterval(d.hitch(_18,"run"),this.rate);}};dojo._Animation.prototype._stopTimer=function(){if(this._timer){d.disconnect(this._timer);this._timer=null;ctr--;}if(ctr<=0){clearInterval(_19);_19=null;ctr=0;}};var _1a=(d.isIE)?function(_1b){var ns=_1b.style;if(!ns.width.length&&d.style(_1b,"width")=="auto"){ns.width="auto";}}:function(){};dojo._fade=function(_1d){_1d.node=d.byId(_1d.node);var _1e=d.mixin({properties:{}},_1d);var _1f=(_1e.properties.opacity={});_1f.start=!("start" in _1e)?function(){return Number(d.style(_1e.node,"opacity"));}:_1e.start;_1f.end=_1e.end;var _20=d.animateProperty(_1e);d.connect(_20,"beforeBegin",d.partial(_1a,_1e.node));return _20;};dojo.fadeIn=function(_21){return d._fade(d.mixin({end:1},_21));};dojo.fadeOut=function(_22){return d._fade(d.mixin({end:0},_22));};dojo._defaultEasing=function(n){return 0.5+((Math.sin((n+1.5)*Math.PI))/2);};var _24=function(_25){this._properties=_25;for(var p in _25){var _27=_25[p];if(_27.start instanceof d.Color){_27.tempColor=new d.Color();}}this.getValue=function(r){var ret={};for(var p in this._properties){var _2b=this._properties[p];var _2c=_2b.start;if(_2c instanceof d.Color){ret[p]=d.blendColors(_2c,_2b.end,r,_2b.tempColor).toCss();}else{if(!d.isArray(_2c)){ret[p]=((_2b.end-_2c)*r)+_2c+(p!="opacity"?_2b.units||"px":"");}}}return ret;};};dojo.animateProperty=function(_2d){_2d.node=d.byId(_2d.node);if(!_2d.easing){_2d.easing=d._defaultEasing;}var _2e=new d._Animation(_2d);d.connect(_2e,"beforeBegin",_2e,function(){var pm={};for(var p in this.properties){if(p=="width"||p=="height"){this.node.display="block";}var _31=this.properties[p];_31=pm[p]=d.mixin({},(d.isObject(_31)?_31:{end:_31}));if(d.isFunction(_31.start)){_31.start=_31.start();}if(d.isFunction(_31.end)){_31.end=_31.end();}var _32=(p.toLowerCase().indexOf("color")>=0);function getStyle(_33,p){var v=({height:_33.offsetHeight,width:_33.offsetWidth})[p];if(v!==undefined){return v;}v=d.style(_33,p);return (p=="opacity")?Number(v):(_32?v:parseFloat(v));};if(!("end" in _31)){_31.end=getStyle(this.node,p);}else{if(!("start" in _31)){_31.start=getStyle(this.node,p);}}if(_32){_31.start=new d.Color(_31.start);_31.end=new d.Color(_31.end);}else{_31.start=(p=="opacity")?Number(_31.start):parseFloat(_31.start);}}this.curve=new _24(pm);});d.connect(_2e,"onAnimate",d.hitch(d,"style",_2e.node));return _2e;};dojo.anim=function(_36,_37,_38,_39,_3a,_3b){return d.animateProperty({node:_36,duration:_38||d._Animation.prototype.duration,properties:_37,easing:_39,onEnd:_3a}).play(_3b||0);};})();} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/_base/html.js b/spring-js/src/main/resources/META-INF/dojo/_base/html.js index 9b97822d..d69ab17f 100644 --- a/spring-js/src/main/resources/META-INF/dojo/_base/html.js +++ b/spring-js/src/main/resources/META-INF/dojo/_base/html.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo._base.html"]){dojo._hasResource["dojo._base.html"]=true;dojo.require("dojo._base.lang");dojo.provide("dojo._base.html");try{document.execCommand("BackgroundImageCache",false,true);}catch(e){}if(dojo.isIE||dojo.isOpera){dojo.byId=function(id,_2){if(dojo.isString(id)){var _d=_2||dojo.doc;var te=_d.getElementById(id);if(te&&te.attributes.id.value==id){return te;}else{var _5=_d.all[id];if(!_5){return;}if(!_5.length){return _5;}var i=0;while((te=_5[i++])){if(te.attributes.id.value==id){return te;}}}}else{return id;}};}else{dojo.byId=function(id,_8){if(dojo.isString(id)){return (_8||dojo.doc).getElementById(id);}else{return id;}};}(function(){var _9=null;dojo._destroyElement=function(_a){_a=dojo.byId(_a);try{if(!_9){_9=document.createElement("div");}_9.appendChild(_a.parentNode?_a.parentNode.removeChild(_a):_a);_9.innerHTML="";}catch(e){}};dojo.isDescendant=function(_b,_c){try{_b=dojo.byId(_b);_c=dojo.byId(_c);while(_b){if(_b===_c){return true;}_b=_b.parentNode;}}catch(e){return -1;}return false;};dojo.setSelectable=function(_d,_e){_d=dojo.byId(_d);if(dojo.isMozilla){_d.style.MozUserSelect=_e?"":"none";}else{if(dojo.isKhtml){_d.style.KhtmlUserSelect=_e?"auto":"none";}else{if(dojo.isIE){_d.unselectable=_e?"":"on";dojo.query("*",_d).forEach(function(_f){_f.unselectable=_e?"":"on";});}}}};var _10=function(_11,ref){ref.parentNode.insertBefore(_11,ref);return true;};var _13=function(_14,ref){var pn=ref.parentNode;if(ref==pn.lastChild){pn.appendChild(_14);}else{return _10(_14,ref.nextSibling);}return true;};dojo.place=function(_17,_18,_19){if(!_17||!_18||_19===undefined){return false;}_17=dojo.byId(_17);_18=dojo.byId(_18);if(typeof _19=="number"){var cn=_18.childNodes;if((_19==0&&cn.length==0)||cn.length==_19){_18.appendChild(_17);return true;}if(_19==0){return _10(_17,_18.firstChild);}return _13(_17,cn[_19-1]);}switch(_19.toLowerCase()){case "before":return _10(_17,_18);case "after":return _13(_17,_18);case "first":if(_18.firstChild){return _10(_17,_18.firstChild);}else{_18.appendChild(_17);return true;}break;default:_18.appendChild(_17);return true;}};dojo.boxModel="content-box";if(dojo.isIE){var _1b=document.compatMode;dojo.boxModel=(_1b=="BackCompat")||(_1b=="QuirksMode")||(dojo.isIE<6)?"border-box":"content-box";}var gcs,dv=document.defaultView;if(dojo.isSafari){gcs=function(_1e){var s=dv.getComputedStyle(_1e,null);if(!s&&_1e.style){_1e.style.display="";s=dv.getComputedStyle(_1e,null);}return s||{};};}else{if(dojo.isIE){gcs=function(_20){return _20.currentStyle;};}else{gcs=function(_21){return dv.getComputedStyle(_21,null);};}}dojo.getComputedStyle=gcs;if(!dojo.isIE){dojo._toPixelValue=function(_22,_23){return parseFloat(_23)||0;};}else{dojo._toPixelValue=function(_24,_25){if(!_25){return 0;}if(_25=="medium"){return 4;}if(_25.slice&&(_25.slice(-2)=="px")){return parseFloat(_25);}with(_24){var _26=style.left;var _27=runtimeStyle.left;runtimeStyle.left=currentStyle.left;try{style.left=_25;_25=style.pixelLeft;}catch(e){_25=0;}style.left=_26;runtimeStyle.left=_27;}return _25;};}dojo._getOpacity=(dojo.isIE?function(_28){try{return (_28.filters.alpha.opacity/100);}catch(e){return 1;}}:function(_29){return dojo.getComputedStyle(_29).opacity;});dojo._setOpacity=(dojo.isIE?function(_2a,_2b){if(_2b==1){_2a.style.cssText=_2a.style.cssText.replace(/FILTER:[^;]*;/i,"");if(_2a.nodeName.toLowerCase()=="tr"){dojo.query("> td",_2a).forEach(function(i){i.style.cssText=i.style.cssText.replace(/FILTER:[^;]*;/i,"");});}}else{var o="Alpha(Opacity="+(_2b*100)+")";_2a.style.filter=o;}if(_2a.nodeName.toLowerCase()=="tr"){dojo.query("> td",_2a).forEach(function(i){i.style.filter=o;});}return _2b;}:function(_2f,_30){return _2f.style.opacity=_30;});var _31={width:true,height:true,left:true,top:true};var _32=function(_33,_34,_35){_34=_34.toLowerCase();if(_31[_34]===true){return dojo._toPixelValue(_33,_35);}else{if(_31[_34]===false){return _35;}else{if(dojo.isOpera&&_34=="cssText"){}if((_34.indexOf("margin")>=0)||(_34.indexOf("padding")>=0)||(_34.indexOf("width")>=0)||(_34.indexOf("height")>=0)||(_34.indexOf("max")>=0)||(_34.indexOf("min")>=0)||(_34.indexOf("offset")>=0)){_31[_34]=true;return dojo._toPixelValue(_33,_35);}else{_31[_34]=false;return _35;}}}};dojo.style=function(_36,_37,_38){var n=dojo.byId(_36),_3a=arguments.length,op=(_37=="opacity");if(_3a==3){return op?dojo._setOpacity(n,_38):n.style[_37]=_38;}if(_3a==2&&op){return dojo._getOpacity(n);}var s=dojo.getComputedStyle(n);return (_3a==1)?s:_32(n,_37,s[_37]);};dojo._getPadExtents=function(n,_3e){var s=_3e||gcs(n),px=dojo._toPixelValue,l=px(n,s.paddingLeft),t=px(n,s.paddingTop);return {l:l,t:t,w:l+px(n,s.paddingRight),h:t+px(n,s.paddingBottom)};};dojo._getBorderExtents=function(n,_44){var ne="none",px=dojo._toPixelValue,s=_44||gcs(n),bl=(s.borderLeftStyle!=ne?px(n,s.borderLeftWidth):0),bt=(s.borderTopStyle!=ne?px(n,s.borderTopWidth):0);return {l:bl,t:bt,w:bl+(s.borderRightStyle!=ne?px(n,s.borderRightWidth):0),h:bt+(s.borderBottomStyle!=ne?px(n,s.borderBottomWidth):0)};};dojo._getPadBorderExtents=function(n,_4b){var s=_4b||gcs(n),p=dojo._getPadExtents(n,s),b=dojo._getBorderExtents(n,s);return {l:p.l+b.l,t:p.t+b.t,w:p.w+b.w,h:p.h+b.h};};dojo._getMarginExtents=function(n,_50){var s=_50||gcs(n),px=dojo._toPixelValue,l=px(n,s.marginLeft),t=px(n,s.marginTop),r=px(n,s.marginRight),b=px(n,s.marginBottom);if(dojo.isSafari&&(s.position!="absolute")){r=l;}return {l:l,t:t,w:l+r,h:t+b};};dojo._getMarginBox=function(_57,_58){var s=_58||gcs(_57),me=dojo._getMarginExtents(_57,s);var l=_57.offsetLeft-me.l,t=_57.offsetTop-me.t;if(dojo.isMoz){var sl=parseFloat(s.left),st=parseFloat(s.top);if(!isNaN(sl)&&!isNaN(st)){l=sl,t=st;}else{var p=_57.parentNode;if(p&&p.style){var pcs=gcs(p);if(pcs.overflow!="visible"){var be=dojo._getBorderExtents(p,pcs);l+=be.l,t+=be.t;}}}}else{if(dojo.isOpera){var p=_57.parentNode;if(p){var be=dojo._getBorderExtents(p);l-=be.l,t-=be.t;}}}return {l:l,t:t,w:_57.offsetWidth+me.w,h:_57.offsetHeight+me.h};};dojo._getContentBox=function(_62,_63){var s=_63||gcs(_62),pe=dojo._getPadExtents(_62,s),be=dojo._getBorderExtents(_62,s),w=_62.clientWidth,h;if(!w){w=_62.offsetWidth,h=_62.offsetHeight;}else{h=_62.clientHeight,be.w=be.h=0;}if(dojo.isOpera){pe.l+=be.l;pe.t+=be.t;}return {l:pe.l,t:pe.t,w:w-pe.w-be.w,h:h-pe.h-be.h};};dojo._getBorderBox=function(_69,_6a){var s=_6a||gcs(_69),pe=dojo._getPadExtents(_69,s),cb=dojo._getContentBox(_69,s);return {l:cb.l-pe.l,t:cb.t-pe.t,w:cb.w+pe.w,h:cb.h+pe.h};};dojo._setBox=function(_6e,l,t,w,h,u){u=u||"px";with(_6e.style){if(!isNaN(l)){left=l+u;}if(!isNaN(t)){top=t+u;}if(w>=0){width=w+u;}if(h>=0){height=h+u;}}};dojo._usesBorderBox=function(_74){var n=_74.tagName;return dojo.boxModel=="border-box"||n=="TABLE"||n=="BUTTON";};dojo._setContentSize=function(_76,_77,_78,_79){var bb=dojo._usesBorderBox(_76);if(bb){var pb=dojo._getPadBorderExtents(_76,_79);if(_77>=0){_77+=pb.w;}if(_78>=0){_78+=pb.h;}}dojo._setBox(_76,NaN,NaN,_77,_78);};dojo._setMarginBox=function(_7c,_7d,_7e,_7f,_80,_81){var s=_81||dojo.getComputedStyle(_7c);var bb=dojo._usesBorderBox(_7c),pb=bb?_85:dojo._getPadBorderExtents(_7c,s),mb=dojo._getMarginExtents(_7c,s);if(_7f>=0){_7f=Math.max(_7f-pb.w-mb.w,0);}if(_80>=0){_80=Math.max(_80-pb.h-mb.h,0);}dojo._setBox(_7c,_7d,_7e,_7f,_80);};var _85={l:0,t:0,w:0,h:0};dojo.marginBox=function(_87,box){var n=dojo.byId(_87),s=gcs(n),b=box;return !b?dojo._getMarginBox(n,s):dojo._setMarginBox(n,b.l,b.t,b.w,b.h,s);};dojo.contentBox=function(_8c,box){var n=dojo.byId(_8c),s=gcs(n),b=box;return !b?dojo._getContentBox(n,s):dojo._setContentSize(n,b.w,b.h,s);};var _91=function(_92,_93){if(!(_92=(_92||0).parentNode)){return 0;}var val,_95=0,_b=dojo.body();while(_92&&_92.style){if(gcs(_92).position=="fixed"){return 0;}val=_92[_93];if(val){_95+=val-0;if(_92==_b){break;}}_92=_92.parentNode;}return _95;};dojo._docScroll=function(){var _b=dojo.body();var _w=dojo.global;var de=dojo.doc.documentElement;return {y:(_w.pageYOffset||de.scrollTop||_b.scrollTop||0),x:(_w.pageXOffset||dojo._fixIeBiDiScrollLeft(de.scrollLeft)||_b.scrollLeft||0)};};dojo._isBodyLtr=function(){return !("_bodyLtr" in dojo)?dojo._bodyLtr=dojo.getComputedStyle(dojo.body()).direction=="ltr":dojo._bodyLtr;};dojo._getIeDocumentElementOffset=function(){var de=dojo.doc.documentElement;if(dojo.isIE>=7){return {x:de.getBoundingClientRect().left,y:de.getBoundingClientRect().top};}else{return {x:dojo._isBodyLtr()||window.parent==window?de.clientLeft:de.offsetWidth-de.clientWidth-de.clientLeft,y:de.clientTop};}};dojo._fixIeBiDiScrollLeft=function(_9b){if(dojo.isIE&&!dojo._isBodyLtr()){var de=dojo.doc.documentElement;return _9b+de.clientWidth-de.scrollWidth;}return _9b;};dojo._abs=function(_9d,_9e){var _9f=_9d.ownerDocument;var ret={x:0,y:0};var _a1=false;var db=dojo.body();if(dojo.isIE){var _a3=_9d.getBoundingClientRect();var _a4=dojo._getIeDocumentElementOffset();ret.x=_a3.left-_a4.x;ret.y=_a3.top-_a4.y;}else{if(_9f["getBoxObjectFor"]){var bo=_9f.getBoxObjectFor(_9d);ret.x=bo.x-_91(_9d,"scrollLeft");ret.y=bo.y-_91(_9d,"scrollTop");}else{if(_9d["offsetParent"]){_a1=true;var _a6;if(dojo.isSafari&&(gcs(_9d).position=="absolute")&&(_9d.parentNode==db)){_a6=db;}else{_a6=db.parentNode;}if(_9d.parentNode!=db){var nd=_9d;if(dojo.isOpera||(dojo.isSafari>=3)){nd=db;}ret.x-=_91(nd,"scrollLeft");ret.y-=_91(nd,"scrollTop");}var _a8=_9d;do{var n=_a8["offsetLeft"];if(!dojo.isOpera||n>0){ret.x+=isNaN(n)?0:n;}var m=_a8["offsetTop"];ret.y+=isNaN(m)?0:m;_a8=_a8.offsetParent;}while((_a8!=_a6)&&_a8);}else{if(_9d["x"]&&_9d["y"]){ret.x+=isNaN(_9d.x)?0:_9d.x;ret.y+=isNaN(_9d.y)?0:_9d.y;}}}}if(_a1||_9e){var _ab=dojo._docScroll();var m=_a1?(!_9e?-1:0):1;ret.y+=m*_ab.y;ret.x+=m*_ab.x;}return ret;};dojo.coords=function(_ac,_ad){var n=dojo.byId(_ac),s=gcs(n),mb=dojo._getMarginBox(n,s);var abs=dojo._abs(n,_ad);mb.x=abs.x;mb.y=abs.y;return mb;};})();dojo.hasClass=function(_b2,_b3){return ((" "+dojo.byId(_b2).className+" ").indexOf(" "+_b3+" ")>=0);};dojo.addClass=function(_b4,_b5){_b4=dojo.byId(_b4);var cls=_b4.className;if((" "+cls+" ").indexOf(" "+_b5+" ")<0){_b4.className=cls+(cls?" ":"")+_b5;}};dojo.removeClass=function(_b7,_b8){_b7=dojo.byId(_b7);var t=dojo.trim((" "+_b7.className+" ").replace(" "+_b8+" "," "));if(_b7.className!=t){_b7.className=t;}};dojo.toggleClass=function(_ba,_bb,_bc){if(_bc===undefined){_bc=!dojo.hasClass(_ba,_bb);}dojo[_bc?"addClass":"removeClass"](_ba,_bb);};} \ No newline at end of file +if(!dojo._hasResource["dojo._base.html"]){dojo._hasResource["dojo._base.html"]=true;dojo.require("dojo._base.lang");dojo.provide("dojo._base.html");try{document.execCommand("BackgroundImageCache",false,true);}catch(e){}if(dojo.isIE||dojo.isOpera){dojo.byId=function(id,_2){if(dojo.isString(id)){var _d=_2||dojo.doc;var te=_d.getElementById(id);if(te&&te.attributes.id.value==id){return te;}else{var _5=_d.all[id];if(!_5||!_5.length){return _5;}var i=0;while((te=_5[i++])){if(te.attributes.id.value==id){return te;}}}}else{return id;}};}else{dojo.byId=function(id,_8){return dojo.isString(id)?(_8||dojo.doc).getElementById(id):id;};}(function(){var d=dojo;var _a=null;dojo.addOnWindowUnload(function(){_a=null;});dojo._destroyElement=function(_b){_b=d.byId(_b);try{if(!_a||_a.ownerDocument!=_b.ownerDocument){_a=_b.ownerDocument.createElement("div");}_a.appendChild(_b.parentNode?_b.parentNode.removeChild(_b):_b);_a.innerHTML="";}catch(e){}};dojo.isDescendant=function(_c,_d){try{_c=d.byId(_c);_d=d.byId(_d);while(_c){if(_c===_d){return true;}_c=_c.parentNode;}}catch(e){}return false;};dojo.setSelectable=function(_e,_f){_e=d.byId(_e);if(d.isMozilla){_e.style.MozUserSelect=_f?"":"none";}else{if(d.isKhtml){_e.style.KhtmlUserSelect=_f?"auto":"none";}else{if(d.isIE){var v=(_e.unselectable=_f?"":"on");d.query("*",_e).forEach("item.unselectable = '"+v+"'");}}}};var _11=function(_12,ref){ref.parentNode.insertBefore(_12,ref);return true;};var _14=function(_15,ref){var pn=ref.parentNode;if(ref==pn.lastChild){pn.appendChild(_15);}else{return _11(_15,ref.nextSibling);}return true;};dojo.place=function(_18,_19,_1a){if(!_18||!_19){return false;}_18=d.byId(_18);_19=d.byId(_19);if(typeof _1a=="number"){var cn=_19.childNodes;if(!cn.length||cn.length<=_1a){_19.appendChild(_18);return true;}return _11(_18,_1a<=0?_19.firstChild:cn[_1a]);}switch(_1a){case "before":return _11(_18,_19);case "after":return _14(_18,_19);case "first":if(_19.firstChild){return _11(_18,_19.firstChild);}default:_19.appendChild(_18);return true;}};dojo.boxModel="content-box";if(d.isIE){var _1c=document.compatMode;d.boxModel=_1c=="BackCompat"||_1c=="QuirksMode"||d.isIE<6?"border-box":"content-box";}var gcs;if(d.isSafari){gcs=function(_1e){var s;if(_1e instanceof HTMLElement){var dv=_1e.ownerDocument.defaultView;s=dv.getComputedStyle(_1e,null);if(!s&&_1e.style){_1e.style.display="";s=dv.getComputedStyle(_1e,null);}}return s||{};};}else{if(d.isIE){gcs=function(_21){return _21.nodeType==1?_21.currentStyle:{};};}else{gcs=function(_22){return _22 instanceof HTMLElement?_22.ownerDocument.defaultView.getComputedStyle(_22,null):{};};}}dojo.getComputedStyle=gcs;if(!d.isIE){dojo._toPixelValue=function(_23,_24){return parseFloat(_24)||0;};}else{dojo._toPixelValue=function(_25,_26){if(!_26){return 0;}if(_26=="medium"){return 4;}if(_26.slice&&(_26.slice(-2)=="px")){return parseFloat(_26);}with(_25){var _27=style.left;var _28=runtimeStyle.left;runtimeStyle.left=currentStyle.left;try{style.left=_26;_26=style.pixelLeft;}catch(e){_26=0;}style.left=_27;runtimeStyle.left=_28;}return _26;};}var px=d._toPixelValue;var _2a="DXImageTransform.Microsoft.Alpha";var af=function(n,f){try{return n.filters.item(_2a);}catch(e){return f?{}:null;}};dojo._getOpacity=d.isIE?function(_2e){try{return af(_2e).Opacity/100;}catch(e){return 1;}}:function(_2f){return gcs(_2f).opacity;};dojo._setOpacity=d.isIE?function(_30,_31){var ov=_31*100;_30.style.zoom=1;af(_30,1).Enabled=(_31==1?false:true);if(!af(_30)){_30.style.filter+=" progid:"+_2a+"(Opacity="+ov+")";}else{af(_30,1).Opacity=ov;}if(_30.nodeName.toLowerCase()=="tr"){d.query("> td",_30).forEach(function(i){d._setOpacity(i,_31);});}return _31;}:function(_34,_35){return _34.style.opacity=_35;};var _36={left:true,top:true};var _37=/margin|padding|width|height|max|min|offset/;var _38=function(_39,_3a,_3b){_3a=_3a.toLowerCase();if(d.isIE){if(_3b=="auto"){if(_3a=="height"){return _39.offsetHeight;}if(_3a=="width"){return _39.offsetWidth;}}if(_3a=="fontweight"){switch(_3b){case 700:return "bold";case 400:default:return "normal";}}}if(!(_3a in _36)){_36[_3a]=_37.test(_3a);}return _36[_3a]?px(_39,_3b):_3b;};var _3c=d.isIE?"styleFloat":"cssFloat";var _3d={"cssFloat":_3c,"styleFloat":_3c,"float":_3c};dojo.style=function(_3e,_3f,_40){var n=d.byId(_3e),_42=arguments.length,op=(_3f=="opacity");_3f=_3d[_3f]||_3f;if(_42==3){return op?d._setOpacity(n,_40):n.style[_3f]=_40;}if(_42==2&&op){return d._getOpacity(n);}var s=gcs(n);if(_42==2&&!d.isString(_3f)){for(var x in _3f){d.style(_3e,x,_3f[x]);}return s;}return (_42==1)?s:_38(n,_3f,s[_3f]||n.style[_3f]);};dojo._getPadExtents=function(n,_47){var s=_47||gcs(n),l=px(n,s.paddingLeft),t=px(n,s.paddingTop);return {l:l,t:t,w:l+px(n,s.paddingRight),h:t+px(n,s.paddingBottom)};};dojo._getBorderExtents=function(n,_4c){var ne="none",s=_4c||gcs(n),bl=(s.borderLeftStyle!=ne?px(n,s.borderLeftWidth):0),bt=(s.borderTopStyle!=ne?px(n,s.borderTopWidth):0);return {l:bl,t:bt,w:bl+(s.borderRightStyle!=ne?px(n,s.borderRightWidth):0),h:bt+(s.borderBottomStyle!=ne?px(n,s.borderBottomWidth):0)};};dojo._getPadBorderExtents=function(n,_52){var s=_52||gcs(n),p=d._getPadExtents(n,s),b=d._getBorderExtents(n,s);return {l:p.l+b.l,t:p.t+b.t,w:p.w+b.w,h:p.h+b.h};};dojo._getMarginExtents=function(n,_57){var s=_57||gcs(n),l=px(n,s.marginLeft),t=px(n,s.marginTop),r=px(n,s.marginRight),b=px(n,s.marginBottom);if(d.isSafari&&(s.position!="absolute")){r=l;}return {l:l,t:t,w:l+r,h:t+b};};dojo._getMarginBox=function(_5d,_5e){var s=_5e||gcs(_5d),me=d._getMarginExtents(_5d,s);var l=_5d.offsetLeft-me.l,t=_5d.offsetTop-me.t,p=_5d.parentNode;if(d.isMoz){var sl=parseFloat(s.left),st=parseFloat(s.top);if(!isNaN(sl)&&!isNaN(st)){l=sl,t=st;}else{if(p&&p.style){var pcs=gcs(p);if(pcs.overflow!="visible"){var be=d._getBorderExtents(p,pcs);l+=be.l,t+=be.t;}}}}else{if(d.isOpera){if(p){var be=d._getBorderExtents(p);l-=be.l;t-=be.t;}}}return {l:l,t:t,w:_5d.offsetWidth+me.w,h:_5d.offsetHeight+me.h};};dojo._getContentBox=function(_68,_69){var s=_69||gcs(_68),pe=d._getPadExtents(_68,s),be=d._getBorderExtents(_68,s),w=_68.clientWidth,h;if(!w){w=_68.offsetWidth,h=_68.offsetHeight;}else{h=_68.clientHeight,be.w=be.h=0;}if(d.isOpera){pe.l+=be.l;pe.t+=be.t;}return {l:pe.l,t:pe.t,w:w-pe.w-be.w,h:h-pe.h-be.h};};dojo._getBorderBox=function(_6f,_70){var s=_70||gcs(_6f),pe=d._getPadExtents(_6f,s),cb=d._getContentBox(_6f,s);return {l:cb.l-pe.l,t:cb.t-pe.t,w:cb.w+pe.w,h:cb.h+pe.h};};dojo._setBox=function(_74,l,t,w,h,u){u=u||"px";var s=_74.style;if(!isNaN(l)){s.left=l+u;}if(!isNaN(t)){s.top=t+u;}if(w>=0){s.width=w+u;}if(h>=0){s.height=h+u;}};dojo._isButtonTag=function(_7b){return _7b.tagName=="BUTTON"||_7b.tagName=="INPUT"&&_7b.getAttribute("type").toUpperCase()=="BUTTON";};dojo._usesBorderBox=function(_7c){var n=_7c.tagName;return d.boxModel=="border-box"||n=="TABLE"||dojo._isButtonTag(_7c);};dojo._setContentSize=function(_7e,_7f,_80,_81){if(d._usesBorderBox(_7e)){var pb=d._getPadBorderExtents(_7e,_81);if(_7f>=0){_7f+=pb.w;}if(_80>=0){_80+=pb.h;}}d._setBox(_7e,NaN,NaN,_7f,_80);};dojo._setMarginBox=function(_83,_84,_85,_86,_87,_88){var s=_88||gcs(_83);var bb=d._usesBorderBox(_83),pb=bb?_8c:d._getPadBorderExtents(_83,s);if(dojo.isSafari){if(dojo._isButtonTag(_83)){var ns=_83.style;if(_86>=0&&!ns.width){ns.width="4px";}if(_87>=0&&!ns.height){ns.height="4px";}}}var mb=d._getMarginExtents(_83,s);if(_86>=0){_86=Math.max(_86-pb.w-mb.w,0);}if(_87>=0){_87=Math.max(_87-pb.h-mb.h,0);}d._setBox(_83,_84,_85,_86,_87);};var _8c={l:0,t:0,w:0,h:0};dojo.marginBox=function(_8f,box){var n=d.byId(_8f),s=gcs(n),b=box;return !b?d._getMarginBox(n,s):d._setMarginBox(n,b.l,b.t,b.w,b.h,s);};dojo.contentBox=function(_94,box){var n=d.byId(_94),s=gcs(n),b=box;return !b?d._getContentBox(n,s):d._setContentSize(n,b.w,b.h,s);};var _99=function(_9a,_9b){if(!(_9a=(_9a||0).parentNode)){return 0;}var val,_9d=0,_b=d.body();while(_9a&&_9a.style){if(gcs(_9a).position=="fixed"){return 0;}val=_9a[_9b];if(val){_9d+=val-0;if(_9a==_b){break;}}_9a=_9a.parentNode;}return _9d;};dojo._docScroll=function(){var _b=d.body(),_w=d.global,de=d.doc.documentElement;return {y:(_w.pageYOffset||de.scrollTop||_b.scrollTop||0),x:(_w.pageXOffset||d._fixIeBiDiScrollLeft(de.scrollLeft)||_b.scrollLeft||0)};};dojo._isBodyLtr=function(){return !("_bodyLtr" in d)?d._bodyLtr=gcs(d.body()).direction=="ltr":d._bodyLtr;};dojo._getIeDocumentElementOffset=function(){var de=d.doc.documentElement;return (d.isIE>=7)?{x:de.getBoundingClientRect().left,y:de.getBoundingClientRect().top}:{x:d._isBodyLtr()||window.parent==window?de.clientLeft:de.offsetWidth-de.clientWidth-de.clientLeft,y:de.clientTop};};dojo._fixIeBiDiScrollLeft=function(_a3){var dd=d.doc;if(d.isIE&&!dojo._isBodyLtr()){var de=dd.compatMode=="BackCompat"?dd.body:dd.documentElement;return _a3+de.clientWidth-de.scrollWidth;}return _a3;};dojo._abs=function(_a6,_a7){var _a8=_a6.ownerDocument;var ret={x:0,y:0};var db=d.body();if(d.isIE||(d.isFF>=3)){var _ab=_a6.getBoundingClientRect();var cs;if(d.isFF){var dv=_a6.ownerDocument.defaultView;cs=dv.getComputedStyle(db.parentNode,null);}var _ae=(d.isIE)?d._getIeDocumentElementOffset():{x:px(db.parentNode,cs.marginLeft),y:px(db.parentNode,cs.marginTop)};ret.x=_ab.left-_ae.x;ret.y=_ab.top-_ae.y;}else{if(_a6["offsetParent"]){var _af;if(d.isSafari&&(gcs(_a6).position=="absolute")&&(_a6.parentNode==db)){_af=db;}else{_af=db.parentNode;}var cs=gcs(_a6);var n=_a6;if(d.isOpera&&cs.position!="absolute"){n=n.offsetParent;}ret.x-=_99(n,"scrollLeft");ret.y-=_99(n,"scrollTop");var _b1=_a6;do{var n=_b1.offsetLeft;if(!d.isOpera||n>0){ret.x+=isNaN(n)?0:n;}var t=_b1.offsetTop;ret.y+=isNaN(t)?0:t;var cs=gcs(_b1);if(_b1!=_a6){if(d.isSafari){ret.x+=px(_b1,cs.borderLeftWidth);ret.y+=px(_b1,cs.borderTopWidth);}else{if(d.isFF){ret.x+=2*px(_b1,cs.borderLeftWidth);ret.y+=2*px(_b1,cs.borderTopWidth);}}}if(d.isFF&&cs.position=="static"){var _b3=_b1.parentNode;while(_b3!=_b1.offsetParent){var pcs=gcs(_b3);if(pcs.position=="static"){ret.x+=px(_b1,pcs.borderLeftWidth);ret.y+=px(_b1,pcs.borderTopWidth);}_b3=_b3.parentNode;}}_b1=_b1.offsetParent;}while((_b1!=_af)&&_b1);}else{if(_a6.x&&_a6.y){ret.x+=isNaN(_a6.x)?0:_a6.x;ret.y+=isNaN(_a6.y)?0:_a6.y;}}}if(_a7){var _b5=d._docScroll();ret.y+=_b5.y;ret.x+=_b5.x;}return ret;};dojo.coords=function(_b6,_b7){var n=d.byId(_b6),s=gcs(n),mb=d._getMarginBox(n,s);var abs=d._abs(n,_b7);mb.x=abs.x;mb.y=abs.y;return mb;};var _bc=d.isIE<8;var _bd=function(_be){switch(_be.toLowerCase()){case "tabindex":return _bc?"tabIndex":"tabindex";case "for":case "htmlfor":return _bc?"htmlFor":"for";case "class":return d.isIE?"className":"class";default:return _be;}};var _bf={colspan:"colSpan",enctype:"enctype",frameborder:"frameborder",method:"method",rowspan:"rowSpan",scrolling:"scrolling",shape:"shape",span:"span",type:"type",valuetype:"valueType"};dojo.hasAttr=function(_c0,_c1){_c0=d.byId(_c0);var _c2=_bd(_c1);_c2=_c2=="htmlFor"?"for":_c2;var _c3=_c0.getAttributeNode&&_c0.getAttributeNode(_c2);return _c3?_c3.specified:false;};var _c4={};var _c5=0;var _c6=dojo._scopeName+"attrid";dojo.attr=function(_c7,_c8,_c9){var _ca=arguments.length;if(_ca==2&&!d.isString(_c8)){for(var x in _c8){d.attr(_c7,x,_c8[x]);}return;}_c7=d.byId(_c7);_c8=_bd(_c8);if(_ca==3){if(d.isFunction(_c9)){var _cc=d.attr(_c7,_c6);if(!_cc){_cc=_c5++;d.attr(_c7,_c6,_cc);}if(!_c4[_cc]){_c4[_cc]={};}var h=_c4[_cc][_c8];if(h){d.disconnect(h);}else{try{delete _c7[_c8];}catch(e){}}_c4[_cc][_c8]=d.connect(_c7,_c8,_c9);}else{if((typeof _c9=="boolean")||(_c8=="innerHTML")){_c7[_c8]=_c9;}else{if((_c8=="style")&&(!d.isString(_c9))){d.style(_c7,_c9);}else{_c7.setAttribute(_c8,_c9);}}}return;}else{var _ce=_bf[_c8.toLowerCase()];if(_ce){return _c7[_ce];}else{var _cf=_c7[_c8];return (typeof _cf=="boolean"||typeof _cf=="function")?_cf:(d.hasAttr(_c7,_c8)?_c7.getAttribute(_c8):null);}}};dojo.removeAttr=function(_d0,_d1){d.byId(_d0).removeAttribute(_bd(_d1));};var _d2="className";dojo.hasClass=function(_d3,_d4){return ((" "+d.byId(_d3)[_d2]+" ").indexOf(" "+_d4+" ")>=0);};dojo.addClass=function(_d5,_d6){_d5=d.byId(_d5);var cls=_d5[_d2];if((" "+cls+" ").indexOf(" "+_d6+" ")<0){_d5[_d2]=cls+(cls?" ":"")+_d6;}};dojo.removeClass=function(_d8,_d9){_d8=d.byId(_d8);var t=d.trim((" "+_d8[_d2]+" ").replace(" "+_d9+" "," "));if(_d8[_d2]!=t){_d8[_d2]=t;}};dojo.toggleClass=function(_db,_dc,_dd){if(_dd===undefined){_dd=!d.hasClass(_db,_dc);}d[_dd?"addClass":"removeClass"](_db,_dc);};})();} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/_base/json.js b/spring-js/src/main/resources/META-INF/dojo/_base/json.js index 67dc2864..0b32678e 100644 --- a/spring-js/src/main/resources/META-INF/dojo/_base/json.js +++ b/spring-js/src/main/resources/META-INF/dojo/_base/json.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo._base.json"]){dojo._hasResource["dojo._base.json"]=true;dojo.provide("dojo._base.json");dojo.fromJson=function(_1){try{return eval("("+_1+")");}catch(e){console.debug(e);return _1;}};dojo._escapeString=function(_2){return ("\""+_2.replace(/(["\\])/g,"\\$1")+"\"").replace(/[\f]/g,"\\f").replace(/[\b]/g,"\\b").replace(/[\n]/g,"\\n").replace(/[\t]/g,"\\t").replace(/[\r]/g,"\\r");};dojo.toJsonIndentStr="\t";dojo.toJson=function(it,_4,_5){_5=_5||"";var _6=(_4?_5+dojo.toJsonIndentStr:"");var _7=(_4?"\n":"");var _8=typeof (it);if(_8=="undefined"){return "undefined";}else{if((_8=="number")||(_8=="boolean")){return it+"";}else{if(it===null){return "null";}}}if(dojo.isString(it)){return dojo._escapeString(it);}if(it.nodeType&&it.cloneNode){return "";}var _9=arguments.callee;var _a;if(typeof it.__json__=="function"){_a=it.__json__();if(it!==_a){return _9(_a,_4,_6);}}if(typeof it.json=="function"){_a=it.json();if(it!==_a){return _9(_a,_4,_6);}}if(dojo.isArray(it)){var _b=[];for(var i=0;i= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo._base.lang"]){dojo._hasResource["dojo._base.lang"]=true;dojo.provide("dojo._base.lang");dojo.isString=function(it){return typeof it=="string"||it instanceof String;};dojo.isArray=function(it){return it&&it instanceof Array||typeof it=="array";};dojo.isFunction=(function(){var _3=function(it){return typeof it=="function"||it instanceof Function;};return dojo.isSafari?function(it){if(typeof it=="function"&&it=="[object NodeList]"){return false;}return _3(it);}:_3;})();dojo.isObject=function(it){return it!==undefined&&(it===null||typeof it=="object"||dojo.isArray(it)||dojo.isFunction(it));};dojo.isArrayLike=function(it){var d=dojo;return it&&it!==undefined&&!d.isString(it)&&!d.isFunction(it)&&!(it.tagName&&it.tagName.toLowerCase()=="form")&&(d.isArray(it)||isFinite(it.length));};dojo.isAlien=function(it){return it&&!dojo.isFunction(it)&&/\{\s*\[native code\]\s*\}/.test(String(it));};dojo.extend=function(_a,_b){for(var i=1,l=arguments.length;i2){return dojo._hitchArgs.apply(dojo,arguments);}if(!_15){_15=_14;_14=null;}if(dojo.isString(_15)){_14=_14||dojo.global;if(!_14[_15]){throw (["dojo.hitch: scope[\"",_15,"\"] is null (scope=\"",_14,"\")"].join(""));}return function(){return _14[_15].apply(_14,arguments||[]);};}return !_14?_15:function(){return _15.apply(_14,arguments||[]);};};dojo.delegate=dojo._delegate=function(obj,_17){function TMP(){};TMP.prototype=obj;var tmp=new TMP();if(_17){dojo.mixin(tmp,_17);}return tmp;};dojo.partial=function(_19){var arr=[null];return dojo.hitch.apply(dojo,arr.concat(dojo._toArray(arguments)));};dojo._toArray=function(obj,_1c,_1d){var arr=_1d||[];for(var x=_1c||0;x2){return dojo._hitchArgs.apply(dojo,arguments);}if(!_15){_15=_14;_14=null;}if(dojo.isString(_15)){_14=_14||dojo.global;if(!_14[_15]){throw (["dojo.hitch: scope[\"",_15,"\"] is null (scope=\"",_14,"\")"].join(""));}return function(){return _14[_15].apply(_14,arguments||[]);};}return !_14?_15:function(){return _15.apply(_14,arguments||[]);};};dojo.delegate=dojo._delegate=(function(){function TMP(){};return function(obj,_17){TMP.prototype=obj;var tmp=new TMP();if(_17){dojo._mixin(tmp,_17);}return tmp;};})();(function(){var _19=function(obj,_1b,_1c){return (_1c||[]).concat(Array.prototype.slice.call(obj,_1b||0));};var _1d=function(obj,_1f,_20){var arr=_20||[];for(var x=_1f||0;x= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo._base.query"]){dojo._hasResource["dojo._base.query"]=true;dojo.provide("dojo._base.query");dojo.require("dojo._base.NodeList");(function(){var d=dojo;var _2=dojo.isIE?"children":"childNodes";var _3=function(_4){if(_4.charAt(_4.length-1)==">"){_4+=" *";}_4+=" ";var ts=function(s,e){return d.trim(_4.slice(s,e));};var _8=[];var _9=-1;var _a=-1;var _b=-1;var _c=-1;var _d=-1;var _e=-1;var _f=-1;var lc="";var cc="";var _12;var x=0;var ql=_4.length;var _15=null;var _cp=null;var _17=function(){if(_f>=0){var tv=(_f==x)?null:ts(_f,x).toLowerCase();_15[(">~+".indexOf(tv)<0)?"tag":"oper"]=tv;_f=-1;}};var _19=function(){if(_e>=0){_15.id=ts(_e,x).replace(/\\/g,"");_e=-1;}};var _1a=function(){if(_d>=0){_15.classes.push(ts(_d+1,x).replace(/\\/g,""));_d=-1;}};var _1b=function(){_19();_17();_1a();};for(;x=0){if(cc=="]"){if(!_cp.attr){_cp.attr=ts(_9+1,x);}else{_cp.matchFor=ts((_b||_9+1),x);}var cmf=_cp.matchFor;if(cmf){if((cmf.charAt(0)=="\"")||(cmf.charAt(0)=="'")){_cp.matchFor=cmf.substring(1,cmf.length-1);}}_15.attrs.push(_cp);_cp=null;_9=_b=-1;}else{if(cc=="="){var _1d=("|~^$*".indexOf(lc)>=0)?lc:"";_cp.type=_1d+cc;_cp.attr=ts(_9+1,x-_1d.length);_b=x+1;}}}else{if(_a>=0){if(cc==")"){if(_c>=0){_cp.value=ts(_a+1,x);}_c=_a=-1;}}else{if(cc=="#"){_1b();_e=x+1;}else{if(cc=="."){_1b();_d=x;}else{if(cc==":"){_1b();_c=x;}else{if(cc=="["){_1b();_9=x;_cp={};}else{if(cc=="("){if(_c>=0){_cp={name:ts(_c+1,x),value:null};_15.pseudos.push(_cp);}_a=x;}else{if(cc==" "&&lc!=cc){_1b();if(_c>=0){_15.pseudos.push({name:ts(_c+1,x)});}_15.hasLoops=(_15.pseudos.length||_15.attrs.length||_15.classes.length);_15.query=ts(_12,x);_15.tag=(_15["oper"])?null:(_15.tag||"*");_8.push(_15);_15=null;}}}}}}}}}return _8;};var _1e={"*=":function(_1f,_20){return "[contains(@"+_1f+", '"+_20+"')]";},"^=":function(_21,_22){return "[starts-with(@"+_21+", '"+_22+"')]";},"$=":function(_23,_24){return "[substring(@"+_23+", string-length(@"+_23+")-"+(_24.length-1)+")='"+_24+"']";},"~=":function(_25,_26){return "[contains(concat(' ',@"+_25+",' '), ' "+_26+" ')]";},"|=":function(_27,_28){return "[contains(concat(' ',@"+_27+",' '), ' "+_28+"-')]";},"=":function(_29,_2a){return "[@"+_29+"='"+_2a+"']";}};var _2b=function(_2c,_2d,_2e,_2f){d.forEach(_2d.attrs,function(_30){var _31;if(_30.type&&_2c[_30.type]){_31=_2c[_30.type](_30.attr,_30.matchFor);}else{if(_30.attr.length){_31=_2e(_30.attr);}}if(_31){_2f(_31);}});};var _32=function(_33){var _34=".";var _35=_3(d.trim(_33));while(_35.length){var tqp=_35.shift();var _37;if(tqp.oper==">"){_37="/";tqp=_35.shift();}else{_37="//";}_34+=_37+tqp.tag;if(tqp.id){_34+="[@id='"+tqp.id+"'][1]";}d.forEach(tqp.classes,function(cn){var cnl=cn.length;var _3a=" ";if(cn.charAt(cnl-1)=="*"){_3a="";cn=cn.substr(0,cnl-1);}_34+="[contains(concat(' ',@class,' '), ' "+cn+_3a+"')]";});_2b(_1e,tqp,function(_3b){return "[@"+_3b+"]";},function(_3c){_34+=_3c;});}return _34;};var _3d={};var _3e=function(_3f){if(_3d[_3f]){return _3d[_3f];}var doc=d.doc;var _41=_32(_3f);var tf=function(_43){var ret=[];var _45;try{_45=doc.evaluate(_41,_43,null,XPathResult.ANY_TYPE,null);}catch(e){console.debug("failure in exprssion:",_41,"under:",_43);console.debug(e);}var _46=_45.iterateNext();while(_46){ret.push(_46);_46=_45.iterateNext();}return ret;};return _3d[_3f]=tf;};var _47={};var _48={};var _49=function(_4a,_4b){if(!_4a){return _4b;}if(!_4b){return _4a;}return function(){return _4a.apply(window,arguments)&&_4b.apply(window,arguments);};};var _4c=function(_4d,_4e,_4f,idx){var _51=idx+1;var _52=(_4e.length==_51);var tqp=_4e[idx];if(tqp.oper==">"){var ecn=_4d[_2];if(!ecn||!ecn.length){return;}_51++;_52=(_4e.length==_51);var tf=_56(_4e[idx+1]);for(var x=0,_58=ecn.length,te;x<_58,te=ecn[x];x++){if(tf(te)){if(_52){_4f.push(te);}else{_4c(te,_4e,_4f,_51);}}}}var _5a=_5b(tqp)(_4d);if(_52){while(_5a.length){_4f.push(_5a.shift());}}else{while(_5a.length){_4c(_5a.shift(),_4e,_4f,_51);}}};var _5c=function(_5d,_5e){var ret=[];var x=_5d.length-1,te;while(te=_5d[x--]){_4c(te,_5e,ret,0);}return ret;};var _56=function(q){if(_47[q.query]){return _47[q.query];}var ff=null;if(q.tag){if(q.tag=="*"){ff=_49(ff,function(_64){return (_64.nodeType==1);});}else{ff=_49(ff,function(_65){return ((_65.nodeType==1)&&(q.tag==_65.tagName.toLowerCase()));});}}if(q.id){ff=_49(ff,function(_66){return ((_66.nodeType==1)&&(_66.id==q.id));});}if(q.hasLoops){ff=_49(ff,_67(q));}return _47[q.query]=ff;};var _68=function(_69){var pn=_69.parentNode;var pnc=pn.childNodes;var _6c=-1;var _6d=pn.firstChild;if(!_6d){return _6c;}var ci=_69["__cachedIndex"];var cl=pn["__cachedLength"];if(((typeof cl=="number")&&(cl!=pnc.length))||(typeof ci!="number")){pn["__cachedLength"]=pnc.length;var idx=1;do{if(_6d===_69){_6c=idx;}if(_6d.nodeType==1){_6d["__cachedIndex"]=idx;idx++;}_6d=_6d.nextSibling;}while(_6d);}else{_6c=ci;}return _6c;};var _71=0;var _72="";var _73=function(_74,_75){if(_75=="class"){return _74.className||_72;}if(_75=="for"){return _74.htmlFor||_72;}return _74.getAttribute(_75,2)||_72;};var _76={"*=":function(_77,_78){return function(_79){return (_73(_79,_77).indexOf(_78)>=0);};},"^=":function(_7a,_7b){return function(_7c){return (_73(_7c,_7a).indexOf(_7b)==0);};},"$=":function(_7d,_7e){var _7f=" "+_7e;return function(_80){var ea=" "+_73(_80,_7d);return (ea.lastIndexOf(_7e)==(ea.length-_7e.length));};},"~=":function(_82,_83){var _84=" "+_83+" ";return function(_85){var ea=" "+_73(_85,_82)+" ";return (ea.indexOf(_84)>=0);};},"|=":function(_87,_88){var _89=" "+_88+"-";return function(_8a){var ea=" "+(_8a.getAttribute(_87,2)||"");return ((ea==_88)||(ea.indexOf(_89)==0));};},"=":function(_8c,_8d){return function(_8e){return (_73(_8e,_8c)==_8d);};}};var _8f={"first-child":function(_90,_91){return function(_92){if(_92.nodeType!=1){return false;}var fc=_92.previousSibling;while(fc&&(fc.nodeType!=1)){fc=fc.previousSibling;}return (!fc);};},"last-child":function(_94,_95){return function(_96){if(_96.nodeType!=1){return false;}var nc=_96.nextSibling;while(nc&&(nc.nodeType!=1)){nc=nc.nextSibling;}return (!nc);};},"empty":function(_98,_99){return function(_9a){var cn=_9a.childNodes;var cnl=_9a.childNodes.length;for(var x=cnl-1;x>=0;x--){var nt=cn[x].nodeType;if((nt==1)||(nt==3)){return false;}}return true;};},"not":function(_9f,_a0){var ntf=_56(_3(_a0)[0]);return function(_a2){return (!ntf(_a2));};},"nth-child":function(_a3,_a4){var pi=parseInt;if(_a4=="odd"){return function(_a6){return (((_68(_a6))%2)==1);};}else{if((_a4=="2n")||(_a4=="even")){return function(_a7){return ((_68(_a7)%2)==0);};}else{if(_a4.indexOf("0n+")==0){var _a8=pi(_a4.substr(3));return function(_a9){return (_a9.parentNode[_2][_a8-1]===_a9);};}else{if((_a4.indexOf("n+")>0)&&(_a4.length>3)){var _aa=_a4.split("n+",2);var _ab=pi(_aa[0]);var idx=pi(_aa[1]);return function(_ad){return ((_68(_ad)%_ab)==idx);};}else{if(_a4.indexOf("n")==-1){var _a8=pi(_a4);return function(_ae){return (_68(_ae)==_a8);};}}}}}}};var _af=(d.isIE)?function(_b0){var clc=_b0.toLowerCase();return function(_b2){return _b2[_b0]||_b2[clc];};}:function(_b3){return function(_b4){return (_b4&&_b4.getAttribute&&_b4.hasAttribute(_b3));};};var _67=function(_b5){var _b6=(_48[_b5.query]||_47[_b5.query]);if(_b6){return _b6;}var ff=null;if(_b5.id){if(_b5.tag!="*"){ff=_49(ff,function(_b8){return (_b8.tagName.toLowerCase()==_b5.tag);});}}d.forEach(_b5.classes,function(_b9,idx,arr){var _bc=_b9.charAt(_b9.length-1)=="*";if(_bc){_b9=_b9.substr(0,_b9.length-1);}var re=new RegExp("(?:^|\\s)"+_b9+(_bc?".*":"")+"(?:\\s|$)");ff=_49(ff,function(_be){return re.test(_be.className);});ff.count=idx;});d.forEach(_b5.pseudos,function(_bf){if(_8f[_bf.name]){ff=_49(ff,_8f[_bf.name](_bf.name,_bf.value));}});_2b(_76,_b5,_af,function(_c0){ff=_49(ff,_c0);});if(!ff){ff=function(){return true;};}return _48[_b5.query]=ff;};var _c1={};var _5b=function(_c2,_c3){var _c4=_c1[_c2.query];if(_c4){return _c4;}if(_c2.id&&!_c2.hasLoops&&!_c2.tag){return _c1[_c2.query]=function(_c5){return [d.byId(_c2.id)];};}var _c6=_67(_c2);var _c7;if(_c2.tag&&_c2.id&&!_c2.hasLoops){_c7=function(_c8){var te=d.byId(_c2.id);if(_c6(te)){return [te];}};}else{var _ca;if(!_c2.hasLoops){_c7=function(_cb){var ret=[];var te,x=0,_ca=_cb.getElementsByTagName(_c2.tag);while(te=_ca[x++]){ret.push(te);}return ret;};}else{_c7=function(_cf){var ret=[];var te,x=0,_ca=_cf.getElementsByTagName(_c2.tag);while(te=_ca[x++]){if(_c6(te)){ret.push(te);}}return ret;};}}return _c1[_c2.query]=_c7;};var _d3={};var _d4={"*":d.isIE?function(_d5){return _d5.all;}:function(_d6){return _d6.getElementsByTagName("*");},">":function(_d7){var ret=[];var te,x=0,_db=_d7[_2];while(te=_db[x++]){if(te.nodeType==1){ret.push(te);}}return ret;}};var _dc=function(_dd){var _de=_3(d.trim(_dd));if(_de.length==1){var tt=_5b(_de[0]);tt.nozip=true;return tt;}var sqf=function(_e1){var _e2=_de.slice(0);var _e3;if(_e2[0].oper==">"){_e3=[_e1];}else{_e3=_5b(_e2.shift())(_e1);}return _5c(_e3,_e2);};return sqf;};var _e4=((document["evaluate"]&&!d.isSafari)?function(_e5){var _e6=_e5.split(" ");if((document["evaluate"])&&(_e5.indexOf(":")==-1)&&((true))){if(((_e6.length>2)&&(_e5.indexOf(">")==-1))||(_e6.length>3)||(_e5.indexOf("[")>=0)||((1==_e6.length)&&(0<=_e5.indexOf(".")))){return _3e(_e5);}}return _dc(_e5);}:_dc);var _e7=function(_e8){if(_d4[_e8]){return _d4[_e8];}if(0>_e8.indexOf(",")){return _d4[_e8]=_e4(_e8);}else{var _e9=_e8.split(/\s*,\s*/);var tf=function(_eb){var _ec=0;var ret=[];var tp;while(tp=_e9[_ec++]){ret=ret.concat(_e4(tp,tp.indexOf(" "))(_eb));}return ret;};return _d4[_e8]=tf;}};var _ef=0;var _f0=function(arr){if(arr&&arr.nozip){return d.NodeList._wrap(arr);}var ret=new d.NodeList();if(!arr){return ret;}if(arr[0]){ret.push(arr[0]);}if(arr.length<2){return ret;}_ef++;arr[0]["_zipIdx"]=_ef;for(var x=1,te;te=arr[x];x++){if(arr[x]["_zipIdx"]!=_ef){ret.push(te);}te["_zipIdx"]=_ef;}return ret;};d.query=function(_f5,_f6){if(_f5.constructor==d.NodeList){return _f5;}if(!d.isString(_f5)){return new d.NodeList(_f5);}if(d.isString(_f6)){_f6=d.byId(_f6);}return _f0(_e7(_f5)(_f6||d.doc));};d._filterQueryResult=function(_f7,_f8){var tnl=new d.NodeList();var ff=(_f8)?_56(_3(_f8)[0]):function(){return true;};for(var x=0,te;te=_f7[x];x++){if(ff(te)){tnl.push(te);}}return tnl;};})();} \ No newline at end of file +if(!dojo._hasResource["dojo._base.query"]){dojo._hasResource["dojo._base.query"]=true;dojo.provide("dojo._base.query");dojo.require("dojo._base.NodeList");(function(){var d=dojo;var _2=dojo.isIE?"children":"childNodes";var _3=false;var _4=function(_5){if(">~+".indexOf(_5.charAt(_5.length-1))>=0){_5+=" *";}_5+=" ";var ts=function(s,e){return d.trim(_5.slice(s,e));};var _9=[];var _a=-1;var _b=-1;var _c=-1;var _d=-1;var _e=-1;var _f=-1;var _10=-1;var lc="";var cc="";var _13;var x=0;var ql=_5.length;var _16=null;var _cp=null;var _18=function(){if(_10>=0){var tv=(_10==x)?null:ts(_10,x);_16[(">~+".indexOf(tv)<0)?"tag":"oper"]=tv;_10=-1;}};var _1a=function(){if(_f>=0){_16.id=ts(_f,x).replace(/\\/g,"");_f=-1;}};var _1b=function(){if(_e>=0){_16.classes.push(ts(_e+1,x).replace(/\\/g,""));_e=-1;}};var _1c=function(){_1a();_18();_1b();};for(;lc=cc,cc=_5.charAt(x),x=0){if(cc=="]"){if(!_cp.attr){_cp.attr=ts(_a+1,x);}else{_cp.matchFor=ts((_c||_a+1),x);}var cmf=_cp.matchFor;if(cmf){if((cmf.charAt(0)=="\"")||(cmf.charAt(0)=="'")){_cp.matchFor=cmf.substring(1,cmf.length-1);}}_16.attrs.push(_cp);_cp=null;_a=_c=-1;}else{if(cc=="="){var _1e=("|~^$*".indexOf(lc)>=0)?lc:"";_cp.type=_1e+cc;_cp.attr=ts(_a+1,x-_1e.length);_c=x+1;}}}else{if(_b>=0){if(cc==")"){if(_d>=0){_cp.value=ts(_b+1,x);}_d=_b=-1;}}else{if(cc=="#"){_1c();_f=x+1;}else{if(cc=="."){_1c();_e=x;}else{if(cc==":"){_1c();_d=x;}else{if(cc=="["){_1c();_a=x;_cp={};}else{if(cc=="("){if(_d>=0){_cp={name:ts(_d+1,x),value:null};_16.pseudos.push(_cp);}_b=x;}else{if(cc==" "&&lc!=cc){_1c();if(_d>=0){_16.pseudos.push({name:ts(_d+1,x)});}_16.hasLoops=(_16.pseudos.length||_16.attrs.length||_16.classes.length);_16.query=ts(_13,x);_16.otag=_16.tag=(_16["oper"])?null:(_16.tag||"*");if(_16.tag){_16.tag=_16.tag.toUpperCase();}_9.push(_16);_16=null;}}}}}}}}}return _9;};var _1f={"*=":function(_20,_21){return "[contains(@"+_20+", '"+_21+"')]";},"^=":function(_22,_23){return "[starts-with(@"+_22+", '"+_23+"')]";},"$=":function(_24,_25){return "[substring(@"+_24+", string-length(@"+_24+")-"+(_25.length-1)+")='"+_25+"']";},"~=":function(_26,_27){return "[contains(concat(' ',@"+_26+",' '), ' "+_27+" ')]";},"|=":function(_28,_29){return "[contains(concat(' ',@"+_28+",' '), ' "+_29+"-')]";},"=":function(_2a,_2b){return "[@"+_2a+"='"+_2b+"']";}};var _2c=function(_2d,_2e,_2f,_30){d.forEach(_2e.attrs,function(_31){var _32;if(_31.type&&_2d[_31.type]){_32=_2d[_31.type](_31.attr,_31.matchFor);}else{if(_31.attr.length){_32=_2f(_31.attr);}}if(_32){_30(_32);}});};var _33=function(_34){var _35=".";var _36=_4(d.trim(_34));while(_36.length){var tqp=_36.shift();var _38;var _39="";if(tqp.oper==">"){_38="/";tqp=_36.shift();}else{if(tqp.oper=="~"){_38="/following-sibling::";tqp=_36.shift();}else{if(tqp.oper=="+"){_38="/following-sibling::";_39="[position()=1]";tqp=_36.shift();}else{_38="//";}}}_35+=_38+tqp.tag+_39;if(tqp.id){_35+="[@id='"+tqp.id+"'][1]";}d.forEach(tqp.classes,function(cn){var cnl=cn.length;var _3c=" ";if(cn.charAt(cnl-1)=="*"){_3c="";cn=cn.substr(0,cnl-1);}_35+="[contains(concat(' ',@class,' '), ' "+cn+_3c+"')]";});_2c(_1f,tqp,function(_3d){return "[@"+_3d+"]";},function(_3e){_35+=_3e;});}return _35;};var _3f={};var _40=function(_41){if(_3f[_41]){return _3f[_41];}var doc=d.doc;var _43=_33(_41);var tf=function(_45){var ret=[];var _47;var _48=doc;if(_45){_48=(_45.nodeType==9)?_45:_45.ownerDocument;}try{_47=_48.evaluate(_43,_45,null,XPathResult.ANY_TYPE,null);}catch(e){console.debug("failure in exprssion:",_43,"under:",_45);console.debug(e);}var _49=_47.iterateNext();while(_49){ret.push(_49);_49=_47.iterateNext();}return ret;};return _3f[_41]=tf;};var _4a={};var _4b={};var _4c=function(_4d,_4e){if(!_4d){return _4e;}if(!_4e){return _4d;}return function(){return _4d.apply(window,arguments)&&_4e.apply(window,arguments);};};var _4f=function(_50){var ret=[];var te,x=0,_54=_50[_2];while((te=_54[x++])){if(te.nodeType==1){ret.push(te);}}return ret;};var _55=function(_56,_57){var ret=[];var te=_56;while(te=te.nextSibling){if(te.nodeType==1){ret.push(te);if(_57){break;}}}return ret;};var _5a=function(_5b,_5c,_5d,idx){var _5f=idx+1;var _60=(_5c.length==_5f);var tqp=_5c[idx];if(tqp.oper){var ecn=(tqp.oper==">")?_4f(_5b):_55(_5b,(tqp.oper=="+"));if(!ecn||!ecn.length){return;}_5f++;_60=(_5c.length==_5f);var tf=_64(_5c[idx+1]);for(var x=0,_66=ecn.length,te;x<_66,te=ecn[x];x++){if(tf(te)){if(_60){_5d.push(te);}else{_5a(te,_5c,_5d,_5f);}}}}var _68=_69(tqp)(_5b);if(_60){while(_68.length){_5d.push(_68.shift());}}else{while(_68.length){_5a(_68.shift(),_5c,_5d,_5f);}}};var _6a=function(_6b,_6c){var ret=[];var x=_6b.length-1,te;while((te=_6b[x--])){_5a(te,_6c,ret,0);}return ret;};var _64=function(q){if(_4a[q.query]){return _4a[q.query];}var ff=null;if(q.tag){if(q.tag=="*"){ff=_4c(ff,function(_72){return (_72.nodeType==1);});}else{ff=_4c(ff,function(_73){return ((_73.nodeType==1)&&(q[_3?"otag":"tag"]==_73.tagName));});}}if(q.id){ff=_4c(ff,function(_74){return ((_74.nodeType==1)&&(_74.id==q.id));});}if(q.hasLoops){ff=_4c(ff,_75(q));}return _4a[q.query]=ff;};var _76=function(_77){var pn=_77.parentNode;var pnc=pn.childNodes;var _7a=-1;var _7b=pn.firstChild;if(!_7b){return _7a;}var ci=_77["__cachedIndex"];var cl=pn["__cachedLength"];if(((typeof cl=="number")&&(cl!=pnc.length))||(typeof ci!="number")){pn["__cachedLength"]=pnc.length;var idx=1;do{if(_7b===_77){_7a=idx;}if(_7b.nodeType==1){_7b["__cachedIndex"]=idx;idx++;}_7b=_7b.nextSibling;}while(_7b);}else{_7a=ci;}return _7a;};var _7f=0;var _80="";var _81=function(_82,_83){if(_83=="class"){return _82.className||_80;}if(_83=="for"){return _82.htmlFor||_80;}if(_83=="style"){return _82.style.cssText||_80;}return _82.getAttribute(_83,2)||_80;};var _84={"*=":function(_85,_86){return function(_87){return (_81(_87,_85).indexOf(_86)>=0);};},"^=":function(_88,_89){return function(_8a){return (_81(_8a,_88).indexOf(_89)==0);};},"$=":function(_8b,_8c){var _8d=" "+_8c;return function(_8e){var ea=" "+_81(_8e,_8b);return (ea.lastIndexOf(_8c)==(ea.length-_8c.length));};},"~=":function(_90,_91){var _92=" "+_91+" ";return function(_93){var ea=" "+_81(_93,_90)+" ";return (ea.indexOf(_92)>=0);};},"|=":function(_95,_96){var _97=" "+_96+"-";return function(_98){var ea=" "+(_98.getAttribute(_95,2)||"");return ((ea==_96)||(ea.indexOf(_97)==0));};},"=":function(_9a,_9b){return function(_9c){return (_81(_9c,_9a)==_9b);};}};var _9d={"checked":function(_9e,_9f){return function(_a0){return !!d.attr(_a0,"checked");};},"first-child":function(_a1,_a2){return function(_a3){if(_a3.nodeType!=1){return false;}var fc=_a3.previousSibling;while(fc&&(fc.nodeType!=1)){fc=fc.previousSibling;}return (!fc);};},"last-child":function(_a5,_a6){return function(_a7){if(_a7.nodeType!=1){return false;}var nc=_a7.nextSibling;while(nc&&(nc.nodeType!=1)){nc=nc.nextSibling;}return (!nc);};},"empty":function(_a9,_aa){return function(_ab){var cn=_ab.childNodes;var cnl=_ab.childNodes.length;for(var x=cnl-1;x>=0;x--){var nt=cn[x].nodeType;if((nt==1)||(nt==3)){return false;}}return true;};},"contains":function(_b0,_b1){return function(_b2){if(_b1.charAt(0)=="\""||_b1.charAt(0)=="'"){_b1=_b1.substr(1,_b1.length-2);}return (_b2.innerHTML.indexOf(_b1)>=0);};},"not":function(_b3,_b4){var ntf=_64(_4(_b4)[0]);return function(_b6){return (!ntf(_b6));};},"nth-child":function(_b7,_b8){var pi=parseInt;if(_b8=="odd"){_b8="2n+1";}else{if(_b8=="even"){_b8="2n";}}if(_b8.indexOf("n")!=-1){var _ba=_b8.split("n",2);var _bb=_ba[0]?(_ba[0]=="-"?-1:pi(_ba[0])):1;var idx=_ba[1]?pi(_ba[1]):0;var lb=0,ub=-1;if(_bb>0){if(idx<0){idx=(idx%_bb)&&(_bb+(idx%_bb));}else{if(idx>0){if(idx>=_bb){lb=idx-idx%_bb;}idx=idx%_bb;}}}else{if(_bb<0){_bb*=-1;if(idx>0){ub=idx;idx=idx%_bb;}}}if(_bb>0){return function(_bf){var i=_76(_bf);return (i>=lb)&&(ub<0||i<=ub)&&((i%_bb)==idx);};}else{_b8=idx;}}var _c1=pi(_b8);return function(_c2){return (_76(_c2)==_c1);};}};var _c3=(d.isIE)?function(_c4){var clc=_c4.toLowerCase();return function(_c6){return _c6[_c4]||_c6[clc];};}:function(_c7){return function(_c8){return (_c8&&_c8.getAttribute&&_c8.hasAttribute(_c7));};};var _75=function(_c9){var _ca=(_4b[_c9.query]||_4a[_c9.query]);if(_ca){return _ca;}var ff=null;if(_c9.id){if(_c9.tag!="*"){ff=_4c(ff,function(_cc){return (_cc.tagName==_c9[_3?"otag":"tag"]);});}}d.forEach(_c9.classes,function(_cd,idx,arr){var _d0=_cd.charAt(_cd.length-1)=="*";if(_d0){_cd=_cd.substr(0,_cd.length-1);}var re=new RegExp("(?:^|\\s)"+_cd+(_d0?".*":"")+"(?:\\s|$)");ff=_4c(ff,function(_d2){return re.test(_d2.className);});ff.count=idx;});d.forEach(_c9.pseudos,function(_d3){if(_9d[_d3.name]){ff=_4c(ff,_9d[_d3.name](_d3.name,_d3.value));}});_2c(_84,_c9,_c3,function(_d4){ff=_4c(ff,_d4);});if(!ff){ff=function(){return true;};}return _4b[_c9.query]=ff;};var _d5={};var _69=function(_d6,_d7){var _d8=_d5[_d6.query];if(_d8){return _d8;}if(_d6.id&&!_d6.hasLoops&&!_d6.tag){return _d5[_d6.query]=function(_d9){return [d.byId(_d6.id)];};}var _da=_75(_d6);var _db;if(_d6.tag&&_d6.id&&!_d6.hasLoops){_db=function(_dc){var te=d.byId(_d6.id,(_dc.ownerDocument||_dc));if(_da(te)){return [te];}};}else{var _de;if(!_d6.hasLoops){_db=function(_df){var ret=[];var te,x=0,_de=_df.getElementsByTagName(_d6[_3?"otag":"tag"]);while((te=_de[x++])){ret.push(te);}return ret;};}else{_db=function(_e3){var ret=[];var te,x=0,_de=_e3.getElementsByTagName(_d6[_3?"otag":"tag"]);while((te=_de[x++])){if(_da(te)){ret.push(te);}}return ret;};}}return _d5[_d6.query]=_db;};var _e7={};var _e8={"*":d.isIE?function(_e9){return _e9.all;}:function(_ea){return _ea.getElementsByTagName("*");},"~":_55,"+":function(_eb){return _55(_eb,true);},">":_4f};var _ec=function(_ed){var _ee=_4(d.trim(_ed));if(_ee.length==1){var tt=_69(_ee[0]);tt.nozip=true;return tt;}var sqf=function(_f1){var _f2=_ee.slice(0);var _f3;if(_f2[0].oper==">"){_f3=[_f1];}else{_f3=_69(_f2.shift())(_f1);}return _6a(_f3,_f2);};return sqf;};var _f4=((document["evaluate"]&&!d.isSafari)?function(_f5,_f6){var _f7=_f5.split(" ");if((!_3)&&(document["evaluate"])&&(_f5.indexOf(":")==-1)&&(_f5.indexOf("+")==-1)){if(((_f7.length>2)&&(_f5.indexOf(">")==-1))||(_f7.length>3)||(_f5.indexOf("[")>=0)||((1==_f7.length)&&(0<=_f5.indexOf(".")))){return _40(_f5);}}return _ec(_f5);}:_ec);var _f8=function(_f9){var qcz=_f9.charAt(0);if(d.doc["querySelectorAll"]&&((!d.isSafari)||(d.isSafari>3.1))&&(">+~".indexOf(qcz)==-1)){return function(_fb){var r=_fb.querySelectorAll(_f9);r.nozip=true;return r;};}if(_e8[_f9]){return _e8[_f9];}if(0>_f9.indexOf(",")){return _e8[_f9]=_f4(_f9);}else{var _fd=_f9.split(/\s*,\s*/);var tf=function(_ff){var _100=0;var ret=[];var tp;while((tp=_fd[_100++])){ret=ret.concat(_f4(tp,tp.indexOf(" "))(_ff));}return ret;};return _e8[_f9]=tf;}};var _103=0;var _zip=function(arr){if(arr&&arr.nozip){return d.NodeList._wrap(arr);}var ret=new d.NodeList();if(!arr){return ret;}if(arr[0]){ret.push(arr[0]);}if(arr.length<2){return ret;}_103++;if(d.isIE&&_3){var _107=_103+"";arr[0].setAttribute("_zipIdx",_107);for(var x=1,te;te=arr[x];x++){if(arr[x].getAttribute("_zipIdx")!=_107){ret.push(te);}te.setAttribute("_zipIdx",_107);}}else{arr[0]["_zipIdx"]=_103;for(var x=1,te;te=arr[x];x++){if(arr[x]["_zipIdx"]!=_103){ret.push(te);}te["_zipIdx"]=_103;}}return ret;};d.query=function(_10a,root){if(_10a.constructor==d.NodeList){return _10a;}if(!d.isString(_10a)){return new d.NodeList(_10a);}if(d.isString(root)){root=d.byId(root);}root=root||d.doc;var od=root.ownerDocument||root.documentElement;_3=(root.contentType&&root.contentType=="application/xml")||(!!od)&&(d.isIE?od.xml:(root.xmlVersion||od.xmlVersion));return _zip(_f8(_10a)(root));};d.query.pseudos=_9d;d._filterQueryResult=function(_10d,_10e){var tnl=new d.NodeList();var ff=(_10e)?_64(_4(_10e)[0]):function(){return true;};for(var x=0,te;te=_10d[x];x++){if(ff(te)){tnl.push(te);}}return tnl;};})();} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/_base/window.js b/spring-js/src/main/resources/META-INF/dojo/_base/window.js index 9bb79c96..554e29b3 100644 --- a/spring-js/src/main/resources/META-INF/dojo/_base/window.js +++ b/spring-js/src/main/resources/META-INF/dojo/_base/window.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo._base.window"]){dojo._hasResource["dojo._base.window"]=true;dojo.provide("dojo._base.window");dojo._gearsObject=function(){var _1;var _2;var _3=dojo.getObject("google.gears");if(_3){return _3;}if(typeof GearsFactory!="undefined"){_1=new GearsFactory();}else{if(dojo.isIE){try{_1=new ActiveXObject("Gears.Factory");}catch(e){}}else{if(navigator.mimeTypes["application/x-googlegears"]){_1=document.createElement("object");_1.setAttribute("type","application/x-googlegears");_1.setAttribute("width",0);_1.setAttribute("height",0);_1.style.display="none";document.documentElement.appendChild(_1);}}}if(!_1){return null;}dojo.setObject("google.gears.factory",_1);return dojo.getObject("google.gears");};dojo.isGears=(!!dojo._gearsObject())||0;dojo.doc=window["document"]||null;dojo.body=function(){return dojo.doc.body||dojo.doc.getElementsByTagName("body")[0];};dojo.setContext=function(_4,_5){dojo.global=_4;dojo.doc=_5;};dojo._fireCallback=function(_6,_7,_8){if(_7&&dojo.isString(_6)){_6=_7[_6];}return (_7?_6.apply(_7,_8||[]):_6());};dojo.withGlobal=function(_9,_a,_b,_c){var _d;var _e=dojo.global;var _f=dojo.doc;try{dojo.setContext(_9,_9.document);_d=dojo._fireCallback(_a,_b,_c);}finally{dojo.setContext(_e,_f);}return _d;};dojo.withDoc=function(_10,_11,_12,_13){var _14;var _15=dojo.doc;try{dojo.doc=_10;_14=dojo._fireCallback(_11,_12,_13);}finally{dojo.doc=_15;}return _14;};(function(){var mp=djConfig["modulePaths"];if(mp){for(var _17 in mp){dojo.registerModulePath(_17,mp[_17]);}}})();} \ No newline at end of file +if(!dojo._hasResource["dojo._base.window"]){dojo._hasResource["dojo._base.window"]=true;dojo.provide("dojo._base.window");dojo.doc=window["document"]||null;dojo.body=function(){return dojo.doc.body||dojo.doc.getElementsByTagName("body")[0];};dojo.setContext=function(_1,_2){dojo.global=_1;dojo.doc=_2;};dojo._fireCallback=function(_3,_4,_5){if(_4&&dojo.isString(_3)){_3=_4[_3];}return _3.apply(_4,_5||[]);};dojo.withGlobal=function(_6,_7,_8,_9){var _a;var _b=dojo.global;var _c=dojo.doc;try{dojo.setContext(_6,_6.document);_a=dojo._fireCallback(_7,_8,_9);}finally{dojo.setContext(_b,_c);}return _a;};dojo.withDoc=function(_d,_e,_f,_10){var _11;var _12=dojo.doc;try{dojo.doc=_d;_11=dojo._fireCallback(_e,_f,_10);}finally{dojo.doc=_12;}return _11;};} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/_base/xhr.js b/spring-js/src/main/resources/META-INF/dojo/_base/xhr.js index a5c2d1f6..73f1d858 100644 --- a/spring-js/src/main/resources/META-INF/dojo/_base/xhr.js +++ b/spring-js/src/main/resources/META-INF/dojo/_base/xhr.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo._base.xhr"]){dojo._hasResource["dojo._base.xhr"]=true;dojo.provide("dojo._base.xhr");dojo.require("dojo._base.Deferred");dojo.require("dojo._base.json");dojo.require("dojo._base.lang");dojo.require("dojo._base.query");(function(){var _d=dojo;function setValue(_2,_3,_4){var _5=_2[_3];if(_d.isString(_5)){_2[_3]=[_5,_4];}else{if(_d.isArray(_5)){_5.push(_4);}else{_2[_3]=_4;}}};dojo.formToObject=function(_6){var _7={};var iq="input:not([type=file]):not([type=submit]):not([type=image]):not([type=reset]):not([type=button]), select, textarea";_d.query(iq,_6).filter(function(_9){return (!_9.disabled);}).forEach(function(_a){var _b=_a.name;var _c=(_a.type||"").toLowerCase();if(_c=="radio"||_c=="checkbox"){if(_a.checked){setValue(_7,_b,_a.value);}}else{if(_a.multiple){_7[_b]=[];_d.query("option",_a).forEach(function(_d){if(_d.selected){setValue(_7,_b,_d.value);}});}else{setValue(_7,_b,_a.value);if(_c=="image"){_7[_b+".x"]=_7[_b+".y"]=_7[_b].x=_7[_b].y=0;}}}});return _7;};dojo.objectToQuery=function(_e){var ec=encodeURIComponent;var ret="";var _11={};for(var x in _e){if(_e[x]!=_11[x]){if(_d.isArray(_e[x])){for(var y=0;y<_e[x].length;y++){ret+=ec(x)+"="+ec(_e[x][y])+"&";}}else{ret+=ec(x)+"="+ec(_e[x])+"&";}}}if(ret.length&&ret.charAt(ret.length-1)=="&"){ret=ret.substr(0,ret.length-1);}return ret;};dojo.formToQuery=function(_14){return _d.objectToQuery(_d.formToObject(_14));};dojo.formToJson=function(_15,_16){return _d.toJson(_d.formToObject(_15),_16);};dojo.queryToObject=function(str){var ret={};var qp=str.split("&");var dc=decodeURIComponent;_d.forEach(qp,function(_1b){if(_1b.length){var _1c=_1b.split("=");var _1d=dc(_1c.shift());var val=dc(_1c.join("="));if(_d.isString(ret[_1d])){ret[_1d]=[ret[_1d]];}if(_d.isArray(ret[_1d])){ret[_1d].push(val);}else{ret[_1d]=val;}}});return ret;};dojo._blockAsync=false;dojo._contentHandlers={"text":function(xhr){return xhr.responseText;},"json":function(xhr){if(!djConfig.usePlainJson){console.debug("Consider using mimetype:text/json-comment-filtered"+" to avoid potential security issues with JSON endpoints"+" (use djConfig.usePlainJson=true to turn off this message)");}return _d.fromJson(xhr.responseText);},"json-comment-filtered":function(xhr){var _22=xhr.responseText;var _23=_22.indexOf("/*");var _24=_22.lastIndexOf("*/");if(_23==-1||_24==-1){throw new Error("JSON was not comment filtered");}return _d.fromJson(_22.substring(_23+2,_24));},"javascript":function(xhr){return _d.eval(xhr.responseText);},"xml":function(xhr){if(_d.isIE&&!xhr.responseXML){_d.forEach(["MSXML2","Microsoft","MSXML","MSXML3"],function(i){try{var doc=new ActiveXObject(prefixes[i]+".XMLDOM");doc.async=false;doc.loadXML(xhr.responseText);return doc;}catch(e){}});}else{return xhr.responseXML;}}};dojo._contentHandlers["json-comment-optional"]=function(xhr){var _2a=_d._contentHandlers;try{return _2a["json-comment-filtered"](xhr);}catch(e){return _2a["json"](xhr);}};dojo._ioSetArgs=function(_2b,_2c,_2d,_2e){var _2f={args:_2b,url:_2b.url};var _30=null;if(_2b.form){var _31=_d.byId(_2b.form);var _32=_31.getAttributeNode("action");_2f.url=_2f.url||(_32?_32.value:null);_30=_d.formToObject(_31);}var _33=[{}];if(_30){_33.push(_30);}if(_2b.content){_33.push(_2b.content);}if(_2b.preventCache){_33.push({"dojo.preventCache":new Date().valueOf()});}_2f.query=_d.objectToQuery(_d.mixin.apply(null,_33));_2f.handleAs=_2b.handleAs||"text";var d=new _d.Deferred(_2c);d.addCallbacks(_2d,function(_35){return _2e(_35,d);});var ld=_2b.load;if(ld&&_d.isFunction(ld)){d.addCallback(function(_37){return ld.call(_2b,_37,_2f);});}var err=_2b.error;if(err&&_d.isFunction(err)){d.addErrback(function(_39){return err.call(_2b,_39,_2f);});}var _3a=_2b.handle;if(_3a&&_d.isFunction(_3a)){d.addBoth(function(_3b){return _3a.call(_2b,_3b,_2f);});}d.ioArgs=_2f;return d;};var _3c=function(dfd){dfd.canceled=true;var xhr=dfd.ioArgs.xhr;var _at=(typeof xhr.abort);if((_at=="function")||(_at=="unknown")){xhr.abort();}var err=new Error("xhr cancelled");err.dojoType="cancel";return err;};var _41=function(dfd){return _d._contentHandlers[dfd.ioArgs.handleAs](dfd.ioArgs.xhr);};var _43=function(_44,dfd){console.debug(_44);return _44;};var _46=function(_47){var dfd=_d._ioSetArgs(_47,_3c,_41,_43);dfd.ioArgs.xhr=_d._xhrObj(dfd.ioArgs.args);return dfd;};var _49=null;var _4a=[];var _4b=function(){var now=(new Date()).getTime();if(!_d._blockAsync){for(var i=0,tif;(i<_4a.length)&&(tif=_4a[i]);i++){var dfd=tif.dfd;try{if(!dfd||dfd.canceled||!tif.validCheck(dfd)){_4a.splice(i--,1);}else{if(tif.ioCheck(dfd)){_4a.splice(i--,1);tif.resHandle(dfd);}else{if(dfd.startTime){if(dfd.startTime+(dfd.ioArgs.args.timeout||0)= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo._firebug.firebug"]){dojo._hasResource["dojo._firebug.firebug"]=true;dojo.provide("dojo._firebug.firebug");dojo.deprecated=function(_1,_2,_3){var _4="DEPRECATED: "+_1;if(_2){_4+=" "+_2;}if(_3){_4+=" -- will be removed in version: "+_3;}console.debug(_4);};dojo.experimental=function(_5,_6){var _7="EXPERIMENTAL: "+_5+" -- APIs subject to change without notice.";if(_6){_7+=" "+_6;}console.debug(_7);};if(((!("console" in window))||(!("firebug" in console)))&&((djConfig["noFirebugLite"]!==true))){(function(){try{if(window!=window.parent){if(window.parent["console"]){window.console=window.parent.console;}return;}}catch(e){}window.console={log:function(){logFormatted(arguments,"");},debug:function(){logFormatted(arguments,"debug");},info:function(){logFormatted(arguments,"info");},warn:function(){logFormatted(arguments,"warning");},error:function(){logFormatted(arguments,"error");},assert:function(_8,_9){if(!_8){var _a=[];for(var i=1;i");for(var i=0;i<_e.length;++i){var _f=_e[i][0],_13=_e[i][1];_d.push("

                  ",escapeHTML(_f),"");appendObject(_13,_d);_d.push("
                  ");logRow(_d,"dir");},dirxml:function(_14){var _15=[];appendNode(_14,_15);logRow(_15,"dirxml");},group:function(){logRow(arguments,"group",pushGroup);},groupEnd:function(){logRow(arguments,"",popGroup);},time:function(_16){_17[_16]=(new Date()).getTime();},timeEnd:function(_18){if(_18 in _17){var _19=(new Date()).getTime()-_17[_18];logFormatted([_18+":",_19+"ms"]);delete _17[_18];}},count:function(){this.warn(["count() not supported."]);},trace:function(){this.warn(["trace() not supported."]);},profile:function(){this.warn(["profile() not supported."]);},profileEnd:function(){},clear:function(){_1a.innerHTML="";},open:function(){toggleConsole(true);},close:function(){if(_1b){toggleConsole();}},closeObjectInspector:function(){consoleObjectInspector.innerHTML="";consoleObjectInspector.style.display="none";_1a.style.display="block";}};var _1c=document;var _1d=window;var _1e=0;var _1f=null;var _1a=null;var _20=null;var _1b=false;var _21=[];var _22=[];var _17={};var _23=">>> ";function toggleConsole(_24){_1b=_24||!_1b;if(_1f){_1f.style.display=_1b?"block":"none";}};function focusCommandLine(){toggleConsole(true);if(_20){_20.focus();}};openWin=function(){var win=window.open("","_firebug","status=0,menubar=0,resizable=1,width=640,height=480,scrollbars=1,addressbar=0");var _26=win.document;HTMLstring="Firebug Lite\n";HTMLstring+="\n";HTMLstring+="
                  ";HTMLstring+="";_26.write(HTMLstring);_26.close();return win;};function createFrame(){if(_1f){return;}if(djConfig.popup){_1d=openWin();_1c=_1d.document;djConfig.debugContainerId="fb";var _27="100%";_1d.console=window.console;_1d.dojo=window.dojo;}else{_1c=document;var _27=(djConfig.debugHeight)?djConfig.debugHeight+"px":"300px";}var _28=_1c.createElement("link");_28.href=dojo.moduleUrl("dojo._firebug","firebug.css");_28.rel="stylesheet";_28.type="text/css";var _29=_1c.getElementsByTagName("head");if(_29){_29=_29[0];}if(!_29){_29=_1c.getElementsByTagName("html")[0];}if(dojo.isIE){window.setTimeout(function(){_29.appendChild(_28);},0);}else{_29.appendChild(_28);}if(typeof djConfig!="undefined"&&djConfig["debugContainerId"]){_1f=_1c.getElementById(djConfig.debugContainerId);}if(!_1f){_1f=_1c.createElement("div");_1c.body.appendChild(_1f);}_1f.className+=" firebug";_1f.style.height=_27;_1f.style.display=(_1b?"block":"none");var _2a=(djConfig.popup)?"":" Close";_1f.innerHTML="
                  "+" Clear"+" "+_2a+" "+"
                  "+""+"
                  "+"
                  ";var _2b=_1c.getElementById("firebugToolbar");_2b.onmousedown=onSplitterMouseDown;_20=_1c.getElementById("firebugCommandLine");addEvent(_20,"keydown",onCommandLineKeyDown);addEvent(_1c,dojo.isIE||dojo.isSafari?"keydown":"keypress",onKeyDown);_1a=_1c.getElementById("firebugLog");consoleObjectInspector=_1c.getElementById("objectLog");layout();flush();};dojo.addOnLoad(createFrame);function evalCommandLine(){var _2c=_20.value;_20.value="";logRow([_23,_2c],"command");var _2d;try{_2d=eval(_2c);}catch(e){console.debug(e);}console.log(_2d);};function layout(){var _2e=_1a.ownerDocument.getElementById("firebugToolbar");var _2f=_1f.offsetHeight-(_2e.offsetHeight+_20.offsetHeight);_1a.style.top=_2e.offsetHeight+"px";_1a.style.height=_2f+"px";_20.style.top=(_1f.offsetHeight-_20.offsetHeight)+"px";};function logRow(_30,_31,_32){if(_1a){writeMessage(_30,_31,_32);}else{_21.push([_30,_31,_32]);}};function flush(){var _33=_21;_21=[];for(var i=0;i<_33.length;++i){writeMessage(_33[i][0],_33[i][1],_33[i][2]);}};function writeMessage(_35,_36,_37){var _38=_1a.scrollTop+_1a.offsetHeight>=_1a.scrollHeight;_37=_37||writeRow;_37(_35,_36);if(_38){_1a.scrollTop=_1a.scrollHeight-_1a.offsetHeight;}};function appendRow(row){var _3a=_22.length?_22[_22.length-1]:_1a;_3a.appendChild(row);};function writeRow(_3b,_3c){var row=_1a.ownerDocument.createElement("div");row.className="logRow"+(_3c?" logRow-"+_3c:"");row.innerHTML=_3b.join("");appendRow(row);};function pushGroup(_3e,_3f){logFormatted(_3e,_3f);var _40=_1a.ownerDocument.createElement("div");_40.className="logGroup";var _41=_1a.ownerDocument.createElement("div");_41.className="logGroupBox";_40.appendChild(_41);appendRow(_41);_22.push(_41);};function popGroup(){_22.pop();};function logFormatted(_42,_43){var _44=[];var _45=_42[0];var _46=0;if(typeof (_45)!="string"){_45="";_46=-1;}var _47=parseFormat(_45);for(var i=0;i<_47.length;++i){var _49=_47[i];if(_49&&typeof (_49)=="object"){var _4a=_42[++_46];_49.appender(_4a,_44);}else{appendText(_49,_44);}}var ids=[];var obs=[];for(var i=_46+1;i<_42.length;++i){appendText(" ",_44);var _4a=_42[i];if(!_4a){continue;}if(typeof (_4a)=="string"){appendText(_4a,_44);}else{if(_4a.nodeType==1){appendText("< "+_4a.tagName+" id=\""+_4a.id+"\" />",_44);}else{var id="_a"+_1e++;ids.push(id);obs.push(_4a);var str=""+getObjectAbbr(_4a)+"";appendLink(str,_44);}}}logRow(_44,_43);for(var i=0;i << Back";consoleObjectInspector.innerHTML=_50+"
                  "+printObject(this.obj)+"
                  ";});}};function parseFormat(_51){var _52=[];var reg=/((^%|[^\\]%)(\d+)?(\.)([a-zA-Z]))|((^%|[^\\]%)([a-zA-Z]))/;var _54={s:appendText,d:appendInteger,i:appendInteger,f:appendFloat};for(var m=reg.exec(_51);m;m=reg.exec(_51)){var _56=m[8]?m[8]:m[5];var _57=_56 in _54?_54[_56]:appendObject;var _58=m[3]?parseInt(m[3]):(m[4]=="."?-1:0);_52.push(_51.substr(0,m[0][0]=="%"?m.index:m.index+1));_52.push({appender:_57,precision:_58});_51=_51.substr(m.index+m[0].length);}_52.push(_51);return _52;};function escapeHTML(_59){function replaceChars(ch){switch(ch){case "<":return "<";case ">":return ">";case "&":return "&";case "'":return "'";case "\"":return """;}return "?";};return String(_59).replace(/[<>&"']/g,replaceChars);};function objectToString(_5b){try{return _5b+"";}catch(e){return null;}};function appendLink(_5c,_5d){_5d.push(objectToString(_5c));};function appendText(_5e,_5f){_5f.push(escapeHTML(objectToString(_5e)));};function appendNull(_60,_61){_61.push("",escapeHTML(objectToString(_60)),"");};function appendString(_62,_63){_63.push(""",escapeHTML(objectToString(_62)),""");};function appendInteger(_64,_65){_65.push("",escapeHTML(objectToString(_64)),"");};function appendFloat(_66,_67){_67.push("",escapeHTML(objectToString(_66)),"");};function appendFunction(_68,_69){var _6a=/function ?(.*?)\(/;var m=_6a.exec(objectToString(_68));var _6c=m?m[1]:"function";_69.push("",escapeHTML(_6c),"()");};function appendObject(_6d,_6e){try{if(_6d==undefined){appendNull("undefined",_6e);}else{if(_6d==null){appendNull("null",_6e);}else{if(typeof _6d=="string"){appendString(_6d,_6e);}else{if(typeof _6d=="number"){appendInteger(_6d,_6e);}else{if(typeof _6d=="function"){appendFunction(_6d,_6e);}else{if(_6d.nodeType==1){appendSelector(_6d,_6e);}else{if(typeof _6d=="object"){appendObjectFormatted(_6d,_6e);}else{appendText(_6d,_6e);}}}}}}}}catch(e){}};function appendObjectFormatted(_6f,_70){var _71=objectToString(_6f);var _72=/\[object (.*?)\]/;var m=_72.exec(_71);_70.push("",m?m[1]:_71,"");};function appendSelector(_74,_75){_75.push("");_75.push("",escapeHTML(_74.nodeName.toLowerCase()),"");if(_74.id){_75.push("#",escapeHTML(_74.id),"");}if(_74.className){_75.push(".",escapeHTML(_74.className),"");}_75.push("");};function appendNode(_76,_77){if(_76.nodeType==1){_77.push("
                  ","<",_76.nodeName.toLowerCase(),"");for(var i=0;i<_76.attributes.length;++i){var _79=_76.attributes[i];if(!_79.specified){continue;}_77.push(" ",_79.nodeName.toLowerCase(),"="",escapeHTML(_79.nodeValue),""");}if(_76.firstChild){_77.push(">
                  ");for(var _7a=_76.firstChild;_7a;_7a=_7a.nextSibling){appendNode(_7a,_77);}_77.push("
                  </",_76.nodeName.toLowerCase(),">
                  ");}else{_77.push("/>");}}else{if(_76.nodeType==3){_77.push("
                  ",escapeHTML(_76.nodeValue),"
                  ");}}};function addEvent(_7b,_7c,_7d){if(document.all){_7b.attachEvent("on"+_7c,_7d);}else{_7b.addEventListener(_7c,_7d,false);}};function removeEvent(_7e,_7f,_80){if(document.all){_7e.detachEvent("on"+_7f,_80);}else{_7e.removeEventListener(_7f,_80,false);}};function cancelEvent(_81){if(document.all){_81.cancelBubble=true;}else{_81.stopPropagation();}};function onError(msg,_83,_84){var _85=[];var _86=_83.lastIndexOf("/");var _87=_86==-1?_83:_83.substr(_86+1);_85.push("",msg,"","
                  ",_87," (line ",_84,")
                  ");logRow(_85,"error");};var _88=(new Date()).getTime();function onKeyDown(_89){var _8a=(new Date()).getTime();if(_8a>_88+200){var _89=dojo.fixEvent(_89);var _8b=dojo.keys;var ekc=_89.keyCode;_88=_8a;if(ekc==_8b.F12){toggleConsole();}else{if((ekc==_8b.NUMPAD_ENTER||ekc==76)&&_89.shiftKey&&(_89.metaKey||_89.ctrlKey)){focusCommandLine();}else{return;}}cancelEvent(_89);}};function onSplitterMouseDown(_8d){if(dojo.isSafari||dojo.isOpera){return;}addEvent(document,"mousemove",onSplitterMouseMove);addEvent(document,"mouseup",onSplitterMouseUp);for(var i=0;i "+getAtts(o[nm])+br;txt+=printObject(o[nm],i+ind);}else{txt+=i+nm+" : "+o[nm]+br;}}return txt;};getObjectAbbr=function(obj){var _a1=(obj instanceof Error);var nm=obj.id||obj.name||obj.ObjectID||obj.widgetId;if(!_a1&&nm){return "{"+nm+"}";}var _a3=2;var _a4=4;var cnt=0;if(_a1){nm="[ Error: "+(obj["message"]||obj["description"]||obj)+" ]";}else{if(dojo.isArray(obj)){nm="[";for(var i=0;i_a4){nm+=" ... ("+obj.length+" items)";break;}}nm+="]";}else{if((!dojo.isObject(obj))||dojo.isString(obj)){nm=obj+"";}else{nm="{";for(var i in obj){cnt++;if(cnt>_a3){break;}nm+=i+"="+obj[i]+" ";}nm+="}";}}}return nm;};window.onerror=onError;addEvent(document,dojo.isIE||dojo.isSafari?"keydown":"keypress",onKeyDown);if((document.documentElement.getAttribute("debug")=="true")||(djConfig.isDebug)){toggleConsole(true);}})();}} \ No newline at end of file +if(!dojo._hasResource["dojo._firebug.firebug"]){dojo._hasResource["dojo._firebug.firebug"]=true;dojo.provide("dojo._firebug.firebug");dojo.deprecated=function(_1,_2,_3){var _4="DEPRECATED: "+_1;if(_2){_4+=" "+_2;}if(_3){_4+=" -- will be removed in version: "+_3;}console.warn(_4);};dojo.experimental=function(_5,_6){var _7="EXPERIMENTAL: "+_5+" -- APIs subject to change without notice.";if(_6){_7+=" "+_6;}console.warn(_7);};if(!dojo.config.useCustomLogger&&!dojo.isAIR&&(!dojo.isFF||(dojo.isFF&&!("console" in window))||(dojo.isFF&&!(window.loadFirebugConsole||console.firebug))&&!dojo.config.noFirebugLite)){(function(){try{if(window!=window.parent){if(window.parent["console"]){window.console=window.parent.console;}return;}}catch(e){}window.console={_connects:[],log:function(){logFormatted(arguments,"");},debug:function(){logFormatted(arguments,"debug");},info:function(){logFormatted(arguments,"info");},warn:function(){logFormatted(arguments,"warning");},error:function(){logFormatted(arguments,"error");},assert:function(_8,_9){if(!_8){var _a=[];for(var i=1;i");_d=_d.replace(/\t/g,"    ");logRow([_d],"dir");},dirxml:function(_e){var _f=[];appendNode(_e,_f);logRow(_f,"dirxml");},group:function(){logRow(arguments,"group",pushGroup);},groupEnd:function(){logRow(arguments,"",popGroup);},time:function(_10){_11[_10]=new Date().getTime();},timeEnd:function(_12){if(_12 in _11){var _13=(new Date()).getTime()-_11[_12];logFormatted([_12+":",_13+"ms"]);delete _11[_12];}},count:function(){this.warn(["count() not supported."]);},trace:function(){this.warn(["trace() not supported."]);},profile:function(){this.warn(["profile() not supported."]);},profileEnd:function(){},clear:function(){if(_14){while(_14.childNodes.length){dojo._destroyElement(_14.firstChild);}}dojo.forEach(this._connects,dojo.disconnect);},open:function(){toggleConsole(true);},close:function(){if(_15){toggleConsole();}},_restoreBorder:function(){if(_16){_16.style.border=_17;}},openDomInspector:function(){_inspectionEnabled=true;_14.style.display="none";consoleDomInspector.style.display="block";consoleObjectInspector.style.display="none";document.body.style.cursor="pointer";_inspectionMoveConnection=dojo.connect(document,"mousemove",function(evt){if(!_inspectionEnabled){return;}if(!_inspectionTimer){_inspectionTimer=setTimeout(function(){_inspectionTimer=null;},50);}else{return;}var _19=evt.target;if(_19&&(_16!==_19)){var _1a=true;console._restoreBorder();var _1b=[];appendNode(_19,_1b);consoleDomInspector.innerHTML=_1b.join("");_16=_19;_17=_16.style.border;_16.style.border="#0000FF 1px solid";}});setTimeout(function(){_inspectionClickConnection=dojo.connect(document,"click",function(evt){document.body.style.cursor="";_1d=!_1d;dojo.disconnect(_1e);});},30);},_closeDomInspector:function(){document.body.style.cursor="";dojo.disconnect(_1f);dojo.disconnect(_1e);_1d=false;console._restoreBorder();},openConsole:function(){_14.style.display="block";_20.style.display="none";_21.style.display="none";console._closeDomInspector();},openObjectInspector:function(){_14.style.display="none";_20.style.display="none";_21.style.display="block";console._closeDomInspector();},recss:function(){var i,a,s;a=document.getElementsByTagName("link");for(i=0;i=0&&s.href){var h=s.href.replace(/(&|%5C?)forceReload=\d+/,"");s.href=h+(h.indexOf("?")>=0?"&":"?")+"forceReload="+new Date().valueOf();}}}};var _26=document;var _27=window;var _28=0;var _29=null;var _14=null;var _21=null;var _2a=null;var _2b=null;var _2c=null;var _15=false;var _2d=[];var _2e=[];var _11={};var _20=null;var _1f;var _1e;var _1d=false;var _2f=null;var _30=document.createElement("div");var _16;var _17;function toggleConsole(_31){_15=_31||!_15;if(_29){_29.style.display=_15?"block":"none";}};function focusCommandLine(){toggleConsole(true);if(_2b){_2b.focus();}};function openWin(x,y,w,h){var win=window.open("","_firebug","status=0,menubar=0,resizable=1,top="+y+",left="+x+",width="+w+",height="+h+",scrollbars=1,addressbar=0");if(!win){var msg="Firebug Lite could not open a pop-up window, most likely because of a blocker.\n"+"Either enable pop-ups for this domain, or change the djConfig to popup=false.";alert(msg);}createResizeHandler(win);var _38=win.document;var _39="Firebug Lite\n"+"\n"+"
                  "+"";_38.write(_39);_38.close();return win;};function createResizeHandler(wn){var d=new Date();d.setTime(d.getTime()+(60*24*60*60*1000));d=d.toUTCString();var dc=wn.document,_3d;if(wn.innerWidth){_3d=function(){return {w:wn.innerWidth,h:wn.innerHeight};};}else{if(dc.documentElement&&dc.documentElement.clientWidth){_3d=function(){return {w:dc.documentElement.clientWidth,h:dc.documentElement.clientHeight};};}else{if(dc.body){_3d=function(){return {w:dc.body.clientWidth,h:dc.body.clientHeight};};}}}window.onFirebugResize=function(){layout(_3d().h);clearInterval(wn._firebugWin_resize);wn._firebugWin_resize=setTimeout(function(){var x=wn.screenLeft,y=wn.screenTop,w=wn.outerWidth||wn.document.body.offsetWidth,h=wn.outerHeight||wn.document.body.offsetHeight;document.cookie="_firebugPosition="+[x,y,w,h].join(",")+"; expires="+d+"; path=/";},5000);};};function createFrame(){if(_29){return;}if(dojo.config.popup){var _42="100%";var _43=document.cookie.match(/(?:^|; )_firebugPosition=([^;]*)/);var p=_43?_43[1].split(","):[2,2,320,480];_27=openWin(p[0],p[1],p[2],p[3]);_26=_27.document;dojo.config.debugContainerId="fb";_27.console=window.console;_27.dojo=window.dojo;}else{_26=document;_42=(dojo.config.debugHeight||300)+"px";}var _45=_26.createElement("link");_45.href=dojo.moduleUrl("dojo._firebug","firebug.css");_45.rel="stylesheet";_45.type="text/css";var _46=_26.getElementsByTagName("head");if(_46){_46=_46[0];}if(!_46){_46=_26.getElementsByTagName("html")[0];}if(dojo.isIE){window.setTimeout(function(){_46.appendChild(_45);},0);}else{_46.appendChild(_45);}if(dojo.config.debugContainerId){_29=_26.getElementById(dojo.config.debugContainerId);}if(!_29){_29=_26.createElement("div");_26.body.appendChild(_29);}_29.className+=" firebug";_29.style.height=_42;_29.style.display=(_15?"block":"none");var _47=function(_48,_49,_4a,_4b){return "
                1. "+_48+"
                  2. ";};_29.innerHTML="
                  "+"
                    "+_47("Clear","Remove All Console Logs","clear","")+_47("ReCSS","Refresh CSS without reloading page","recss","")+_47("Console","Show Console Logs","openConsole","gap")+_47("DOM","Show DOM Inspector","openDomInspector","")+_47("Object","Show Object Inspector","openObjectInspector","")+((dojo.config.popup)?"":_47("Close","Close the console","close","gap"))+"\t
                  "+"
                  "+""+"
                  "+"
                  Click on an object in the Log display
                  "+"
                  Hover over HTML elements in the main page. Click to hold selection.
                  ";_2c=_26.getElementById("firebugToolbar");_2b=_26.getElementById("firebugCommandLine");addEvent(_2b,"keydown",onCommandLineKeyDown);addEvent(_26,dojo.isIE||dojo.isSafari?"keydown":"keypress",onKeyDown);_14=_26.getElementById("firebugLog");_21=_26.getElementById("objectLog");_20=_26.getElementById("domInspect");_2a=_26.getElementById("fireBugTabs");layout();flush();};dojo.addOnLoad(createFrame);function clearFrame(){_26=null;if(_27.console){_27.console.clear();}_27=null;_29=null;_14=null;_21=null;_20=null;_2b=null;_2d=[];_2e=[];_11={};};dojo.addOnUnload(clearFrame);function evalCommandLine(){var _4c=_2b.value;_2b.value="";logRow(["> ",_4c],"command");var _4d;try{_4d=eval(_4c);}catch(e){console.debug(e);}console.log(_4d);};function layout(h){var _4f=25;var _50=h?h-(_4f+_2b.offsetHeight+25+(h*0.01))+"px":(_29.offsetHeight-_4f-_2b.offsetHeight)+"px";_14.style.top=_4f+"px";_14.style.height=_50;_21.style.height=_50;_21.style.top=_4f+"px";_20.style.height=_50;_20.style.top=_4f+"px";_2b.style.bottom=0;};function logRow(_51,_52,_53){if(_14){writeMessage(_51,_52,_53);}else{_2d.push([_51,_52,_53]);}};function flush(){var _54=_2d;_2d=[];for(var i=0;i<_54.length;++i){writeMessage(_54[i][0],_54[i][1],_54[i][2]);}};function writeMessage(_56,_57,_58){var _59=_14.scrollTop+_14.offsetHeight>=_14.scrollHeight;_58=_58||writeRow;_58(_56,_57);if(_59){_14.scrollTop=_14.scrollHeight-_14.offsetHeight;}};function appendRow(row){var _5b=_2e.length?_2e[_2e.length-1]:_14;_5b.appendChild(row);};function writeRow(_5c,_5d){var row=_14.ownerDocument.createElement("div");row.className="logRow"+(_5d?" logRow-"+_5d:"");row.innerHTML=_5c.join("");appendRow(row);};function pushGroup(_5f,_60){logFormatted(_5f,_60);var _61=_14.ownerDocument.createElement("div");_61.className="logGroupBox";appendRow(_61);_2e.push(_61);};function popGroup(){_2e.pop();};function logFormatted(_62,_63){var _64=[];var _65=_62[0];var _66=0;if(typeof (_65)!="string"){_65="";_66=-1;}var _67=parseFormat(_65);for(var i=0;i<_67.length;++i){var _69=_67[i];if(_69&&typeof _69=="object"){_69.appender(_62[++_66],_64);}else{appendText(_69,_64);}}var ids=[];var obs=[];for(i=_66+1;i<_62.length;++i){appendText(" ",_64);var _6c=_62[i];if(_6c===undefined||_6c===null){appendNull(_6c,_64);}else{if(typeof (_6c)=="string"){appendText(_6c,_64);}else{if(_6c instanceof Date){appendText(_6c.toString(),_64);}else{if(_6c.nodeType==9){appendText("[ XmlDoc ]",_64);}else{var id="_a"+_28++;ids.push(id);obs.push(_6c);var str=""+getObjectAbbr(_6c)+"";appendLink(str,_64);}}}}}logRow(_64,_63);for(i=0;i"+printObject(this.obj)+"";}));}};function parseFormat(_70){var _71=[];var reg=/((^%|[^\\]%)(\d+)?(\.)([a-zA-Z]))|((^%|[^\\]%)([a-zA-Z]))/;var _73={s:appendText,d:appendInteger,i:appendInteger,f:appendFloat};for(var m=reg.exec(_70);m;m=reg.exec(_70)){var _75=m[8]?m[8]:m[5];var _76=_75 in _73?_73[_75]:appendObject;var _77=m[3]?parseInt(m[3]):(m[4]=="."?-1:0);_71.push(_70.substr(0,m[0][0]=="%"?m.index:m.index+1));_71.push({appender:_76,precision:_77});_70=_70.substr(m.index+m[0].length);}_71.push(_70);return _71;};function escapeHTML(_78){function replaceChars(ch){switch(ch){case "<":return "<";case ">":return ">";case "&":return "&";case "'":return "'";case "\"":return """;}return "?";};return String(_78).replace(/[<>&"']/g,replaceChars);};function objectToString(_7a){try{return _7a+"";}catch(e){return null;}};function appendLink(_7b,_7c){_7c.push(objectToString(_7b));};function appendText(_7d,_7e){_7e.push(escapeHTML(objectToString(_7d)));};function appendNull(_7f,_80){_80.push("",escapeHTML(objectToString(_7f)),"");};function appendString(_81,_82){_82.push(""",escapeHTML(objectToString(_81)),""");};function appendInteger(_83,_84){_84.push("",escapeHTML(objectToString(_83)),"");};function appendFloat(_85,_86){_86.push("",escapeHTML(objectToString(_85)),"");};function appendFunction(_87,_88){_88.push("",getObjectAbbr(_87),"");};function appendObject(_89,_8a){try{if(_89===undefined){appendNull("undefined",_8a);}else{if(_89===null){appendNull("null",_8a);}else{if(typeof _89=="string"){appendString(_89,_8a);}else{if(typeof _89=="number"){appendInteger(_89,_8a);}else{if(typeof _89=="function"){appendFunction(_89,_8a);}else{if(_89.nodeType==1){appendSelector(_89,_8a);}else{if(typeof _89=="object"){appendObjectFormatted(_89,_8a);}else{appendText(_89,_8a);}}}}}}}}catch(e){}};function appendObjectFormatted(_8b,_8c){var _8d=objectToString(_8b);var _8e=/\[object (.*?)\]/;var m=_8e.exec(_8d);_8c.push("",m?m[1]:_8d,"");};function appendSelector(_90,_91){_91.push("");_91.push("",escapeHTML(_90.nodeName.toLowerCase()),"");if(_90.id){_91.push("#",escapeHTML(_90.id),"");}if(_90.className){_91.push(".",escapeHTML(_90.className),"");}_91.push("");};function appendNode(_92,_93){if(_92.nodeType==1){_93.push("
                  ","<",_92.nodeName.toLowerCase(),"");for(var i=0;i<_92.attributes.length;++i){var _95=_92.attributes[i];if(!_95.specified){continue;}_93.push(" ",_95.nodeName.toLowerCase(),"="",escapeHTML(_95.nodeValue),""");}if(_92.firstChild){_93.push(">
                  ");for(var _96=_92.firstChild;_96;_96=_96.nextSibling){appendNode(_96,_93);}_93.push("
                  </",_92.nodeName.toLowerCase(),">
                  ");}else{_93.push("/>");}}else{if(_92.nodeType==3){_93.push("
                  ",escapeHTML(_92.nodeValue),"
                  ");}}};function addEvent(_97,_98,_99){if(document.all){_97.attachEvent("on"+_98,_99);}else{_97.addEventListener(_98,_99,false);}};function removeEvent(_9a,_9b,_9c){if(document.all){_9a.detachEvent("on"+_9b,_9c);}else{_9a.removeEventListener(_9b,_9c,false);}};function cancelEvent(_9d){if(document.all){_9d.cancelBubble=true;}else{_9d.stopPropagation();}};function onError(msg,_9f,_a0){var _a1=_9f.lastIndexOf("/");var _a2=_a1==-1?_9f:_9f.substr(_a1+1);var _a3=["",msg,"","
                  ",_a2," (line ",_a0,")
                  "];logRow(_a3,"error");};var _a4=new Date().getTime();function onKeyDown(_a5){var _a6=(new Date()).getTime();if(_a6>_a4+200){_a5=dojo.fixEvent(_a5);var _a7=dojo.keys;var ekc=_a5.keyCode;_a4=_a6;if(ekc==_a7.F12){toggleConsole();}else{if((ekc==_a7.NUMPAD_ENTER||ekc==76)&&_a5.shiftKey&&(_a5.metaKey||_a5.ctrlKey)){focusCommandLine();}else{return;}}cancelEvent(_a5);}};function onCommandLineKeyDown(e){var dk=dojo.keys;if(e.keyCode==13&&_2b.value){addToHistory(_2b.value);evalCommandLine();}else{if(e.keyCode==27){_2b.value="";}else{if(e.keyCode==dk.UP_ARROW||e.charCode==dk.UP_ARROW){navigateHistory("older");}else{if(e.keyCode==dk.DOWN_ARROW||e.charCode==dk.DOWN_ARROW){navigateHistory("newer");}else{if(e.keyCode==dk.HOME||e.charCode==dk.HOME){_ab=1;navigateHistory("older");}else{if(e.keyCode==dk.END||e.charCode==dk.END){_ab=999999;navigateHistory("newer");}}}}}}};var _ab=-1;var _ac=null;function addToHistory(_ad){var _ae=cookie("firebug_history");_ae=(_ae)?dojo.fromJson(_ae):[];var pos=dojo.indexOf(_ae,_ad);if(pos!=-1){_ae.splice(pos,1);}_ae.push(_ad);cookie("firebug_history",dojo.toJson(_ae),30);while(_ae.length&&!cookie("firebug_history")){_ae.shift();cookie("firebug_history",dojo.toJson(_ae),30);}_ac=null;_ab=-1;};function navigateHistory(_b0){var _b1=cookie("firebug_history");_b1=(_b1)?dojo.fromJson(_b1):[];if(!_b1.length){return;}if(_ac===null){_ac=_2b.value;}if(_ab==-1){_ab=_b1.length;}if(_b0=="older"){--_ab;if(_ab<0){_ab=0;}}else{if(_b0=="newer"){++_ab;if(_ab>_b1.length){_ab=_b1.length;}}}if(_ab==_b1.length){_2b.value=_ac;_ac=null;}else{_2b.value=_b1[_ab];}};function cookie(_b2,_b3){var c=document.cookie;if(arguments.length==1){var _b5=c.match(new RegExp("(?:^|; )"+_b2+"=([^;]*)"));return _b5?decodeURIComponent(_b5[1]):undefined;}else{var d=new Date();d.setMonth(d.getMonth()+1);document.cookie=_b2+"="+encodeURIComponent(_b3)+((d.toUtcString)?"; expires="+d.toUTCString():"");}};function isArray(it){return it&&it instanceof Array||typeof it=="array";};function objectLength(o){var cnt=0;for(var nm in o){cnt++;}return cnt;};function printObject(o,i,txt,_be){var ind=" \t";txt=txt||"";i=i||ind;_be=_be||[];var _c0;if(o&&o.nodeType==1){var _c1=[];appendNode(o,_c1);return _c1.join("");}var br=",\n",cnt=0,_c4=objectLength(o);if(o instanceof Date){return i+o.toString()+br;}looking:for(var nm in o){cnt++;if(cnt==_c4){br="\n";}if(o[nm]===window||o[nm]===document){continue;}else{if(o[nm]===null){txt+=i+nm+" : NULL"+br;}else{if(o[nm]&&o[nm].nodeType){if(o[nm].nodeType==1){}else{if(o[nm].nodeType==3){txt+=i+nm+" : [ TextNode "+o[nm].data+" ]"+br;}}}else{if(typeof o[nm]=="object"&&(o[nm] instanceof String||o[nm] instanceof Number||o[nm] instanceof Boolean)){txt+=i+nm+" : "+o[nm]+","+br;}else{if(o[nm] instanceof Date){txt+=i+nm+" : "+o[nm].toString()+br;}else{if(typeof (o[nm])=="object"&&o[nm]){for(var j=0,_c7;_c7=_be[j];j++){if(o[nm]===_c7){txt+=i+nm+" : RECURSION"+br;continue looking;}}_be.push(o[nm]);_c0=(isArray(o[nm]))?["[","]"]:["{","}"];txt+=i+nm+" : "+_c0[0]+"\n";txt+=printObject(o[nm],i+ind,"",_be);txt+=i+_c0[1]+br;}else{if(typeof o[nm]=="undefined"){txt+=i+nm+" : undefined"+br;}else{if(nm=="toString"&&typeof o[nm]=="function"){var _c8=o[nm]();if(typeof _c8=="string"&&_c8.match(/function ?(.*?)\(/)){_c8=escapeHTML(getObjectAbbr(o[nm]));}txt+=i+nm+" : "+_c8+br;}else{txt+=i+nm+" : "+escapeHTML(getObjectAbbr(o[nm]))+br;}}}}}}}}}return txt;};function getObjectAbbr(obj){var _ca=(obj instanceof Error);if(obj.nodeType==1||obj.nodeType==3){return escapeHTML("< "+obj.tagName.toLowerCase()+" id=\""+obj.id+"\" />");}var nm=(obj&&(obj.id||obj.name||obj.ObjectID||obj.widgetId));if(!_ca&&nm){return "{"+nm+"}";}var _cc=2;var _cd=4;var cnt=0;if(_ca){nm="[ Error: "+(obj.message||obj.description||obj)+" ]";}else{if(isArray(obj)){nm="["+obj.slice(0,_cd).join(",");if(obj.length>_cd){nm+=" ... ("+obj.length+" items)";}nm+="]";}else{if(typeof obj=="function"){nm=obj+"";var reg=/function\s*([^\(]*)(\([^\)]*\))[^\{]*\{/;var m=reg.exec(nm);if(m){if(!m[1]){m[1]="function";}nm=m[1]+m[2];}else{nm="function()";}}else{if(typeof obj!="object"||typeof obj=="string"){nm=obj+"";}else{nm="{";for(var i in obj){cnt++;if(cnt>_cc){break;}nm+=i+":"+escapeHTML(obj[i])+" ";}nm+="}";}}}}return nm;};addEvent(document,dojo.isIE||dojo.isSafari?"keydown":"keypress",onKeyDown);if((document.documentElement.getAttribute("debug")=="true")||(dojo.config.isDebug)){toggleConsole(true);}if(dojo.config.noFirebugLite){console.warn("DEPRECATED: dojo.config.noFirebugLite - use djConfig.isDebug=false instead");}if(dojo.isFF&&!window.loadFirebugConsole&&!dojo.config.allowFirebugLite){console.log("To disable Firebug Lite in Firefox, use djConfig.isDebug=false. Suppress this message with djConfig.allowFirebugLite=true");}})();}} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/_firebug/tab_lft_norm.png b/spring-js/src/main/resources/META-INF/dojo/_firebug/tab_lft_norm.png new file mode 100644 index 00000000..f0479a28 Binary files /dev/null and b/spring-js/src/main/resources/META-INF/dojo/_firebug/tab_lft_norm.png differ diff --git a/spring-js/src/main/resources/META-INF/dojo/_firebug/tab_lft_over.png b/spring-js/src/main/resources/META-INF/dojo/_firebug/tab_lft_over.png new file mode 100644 index 00000000..2f36cca9 Binary files /dev/null and b/spring-js/src/main/resources/META-INF/dojo/_firebug/tab_lft_over.png differ diff --git a/spring-js/src/main/resources/META-INF/dojo/_firebug/tab_rgt_norm.png b/spring-js/src/main/resources/META-INF/dojo/_firebug/tab_rgt_norm.png new file mode 100644 index 00000000..464af3ef Binary files /dev/null and b/spring-js/src/main/resources/META-INF/dojo/_firebug/tab_rgt_norm.png differ diff --git a/spring-js/src/main/resources/META-INF/dojo/_firebug/tab_rgt_over.png b/spring-js/src/main/resources/META-INF/dojo/_firebug/tab_rgt_over.png new file mode 100644 index 00000000..2bc2cd07 Binary files /dev/null and b/spring-js/src/main/resources/META-INF/dojo/_firebug/tab_rgt_over.png differ diff --git a/spring-js/src/main/resources/META-INF/dojo/back.js b/spring-js/src/main/resources/META-INF/dojo/back.js index 563484b6..cf120f7a 100644 --- a/spring-js/src/main/resources/META-INF/dojo/back.js +++ b/spring-js/src/main/resources/META-INF/dojo/back.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo.back"]){dojo._hasResource["dojo.back"]=true;dojo.provide("dojo.back");(function(){var _1=dojo.back;function getHash(){var h=window.location.hash;if(h.charAt(0)=="#"){h=h.substring(1);}return dojo.isMozilla?h:decodeURIComponent(h);};function setHash(h){if(!h){h="";}window.location.hash=encodeURIComponent(h);_4=history.length;};if(dojo.exists("tests.back-hash")){_1.getHash=getHash;_1.setHash=setHash;}var _5=(typeof (window)!=="undefined")?window.location.href:"";var _6=(typeof (window)!=="undefined")?getHash():"";var _7=null;var _8=null;var _9=null;var _a=null;var _b=[];var _c=[];var _d=false;var _e=false;var _4;function handleBackButton(){var _f=_c.pop();if(!_f){return;}var _10=_c[_c.length-1];if(!_10&&_c.length==0){_10=_7;}if(_10){if(_10.kwArgs["back"]){_10.kwArgs["back"]();}else{if(_10.kwArgs["backButton"]){_10.kwArgs["backButton"]();}else{if(_10.kwArgs["handle"]){_10.kwArgs.handle("back");}}}}_b.push(_f);};_1.goBack=handleBackButton;function handleForwardButton(){var _11=_b.pop();if(!_11){return;}if(_11.kwArgs["forward"]){_11.kwArgs.forward();}else{if(_11.kwArgs["forwardButton"]){_11.kwArgs.forwardButton();}else{if(_11.kwArgs["handle"]){_11.kwArgs.handle("forward");}}}_c.push(_11);};_1.goForward=handleForwardButton;function createState(url,_13,_14){return {"url":url,"kwArgs":_13,"urlHash":_14};};function getUrlQuery(url){var _16=url.split("?");if(_16.length<2){return null;}else{return _16[1];}};function loadIframeHistory(){var url=(djConfig["dojoIframeHistoryUrl"]||dojo.moduleUrl("dojo","resources/iframe_history.html"))+"?"+(new Date()).getTime();_d=true;if(_a){(dojo.isSafari)?_a.location=url:window.frames[_a.name].location=url;}else{}return url;};function checkLocation(){if(!_e){var hsl=_c.length;var _19=getHash();if((_19===_6||window.location.href==_5)&&(hsl==1)){handleBackButton();return;}if(_b.length>0){if(_b[_b.length-1].urlHash===_19){handleForwardButton();return;}}if((hsl>=2)&&(_c[hsl-2])){if(_c[hsl-2].urlHash===_19){handleBackButton();return;}}if(dojo.isSafari&&dojo.isSafari<3){var _1a=history.length;if(_1a>_4){handleForwardButton();}else{if(_1a<_4){handleBackButton();}}_4=_1a;}}};_1.init=function(){if(dojo.byId("dj_history")){return;}var src=djConfig["dojoIframeHistoryUrl"]||dojo.moduleUrl("dojo","resources/iframe_history.html");document.write("");};_1.setInitialState=function(_1c){_7=createState(_5,_1c,_6);};_1.addToHistory=function(_1d){_b=[];var _1e=null;var url=null;if(!_a){if(djConfig["useXDomain"]&&!djConfig["dojoIframeHistoryUrl"]){console.debug("dojo.back: When using cross-domain Dojo builds,"+" please save iframe_history.html to your domain and set djConfig.dojoIframeHistoryUrl"+" to the path on your domain to iframe_history.html");}_a=window.frames["dj_history"];}if(!_9){_9=document.createElement("a");dojo.body().appendChild(_9);_9.style.display="none";}if(_1d["changeUrl"]){_1e=""+((_1d["changeUrl"]!==true)?_1d["changeUrl"]:(new Date()).getTime());if(_c.length==0&&_7.urlHash==_1e){_7=createState(url,_1d,_1e);return;}else{if(_c.length>0&&_c[_c.length-1].urlHash==_1e){_c[_c.length-1]=createState(url,_1d,_1e);return;}}_e=true;setTimeout(function(){setHash(_1e);_e=false;},1);_9.href=_1e;if(dojo.isIE){url=loadIframeHistory();var _20=_1d["back"]||_1d["backButton"]||_1d["handle"];var tcb=function(_22){if(getHash()!=""){setTimeout(function(){setHash(_1e);},1);}_20.apply(this,[_22]);};if(_1d["back"]){_1d.back=tcb;}else{if(_1d["backButton"]){_1d.backButton=tcb;}else{if(_1d["handle"]){_1d.handle=tcb;}}}var _23=_1d["forward"]||_1d["forwardButton"]||_1d["handle"];var tfw=function(_25){if(getHash()!=""){setHash(_1e);}if(_23){_23.apply(this,[_25]);}};if(_1d["forward"]){_1d.forward=tfw;}else{if(_1d["forwardButton"]){_1d.forwardButton=tfw;}else{if(_1d["handle"]){_1d.handle=tfw;}}}}else{if(!dojo.isIE){if(!_8){_8=setInterval(checkLocation,200);}}}}else{url=loadIframeHistory();}_c.push(createState(url,_1d,_1e));};_1._iframeLoaded=function(evt,_27){var _28=getUrlQuery(_27.href);if(_28==null){if(_c.length==1){handleBackButton();}return;}if(_d){_d=false;return;}if(_c.length>=2&&_28==getUrlQuery(_c[_c.length-2].url)){handleBackButton();}else{if(_b.length>0&&_28==getUrlQuery(_b[_b.length-1].url)){handleForwardButton();}}};})();} \ No newline at end of file +if(!dojo._hasResource["dojo.back"]){dojo._hasResource["dojo.back"]=true;dojo.provide("dojo.back");(function(){var _1=dojo.back;function getHash(){var h=window.location.hash;if(h.charAt(0)=="#"){h=h.substring(1);}return dojo.isMozilla?h:decodeURIComponent(h);};function setHash(h){if(!h){h="";}window.location.hash=encodeURIComponent(h);_4=history.length;};if(dojo.exists("tests.back-hash")){_1.getHash=getHash;_1.setHash=setHash;}var _5=(typeof (window)!=="undefined")?window.location.href:"";var _6=(typeof (window)!=="undefined")?getHash():"";var _7=null;var _8=null;var _9=null;var _a=null;var _b=[];var _c=[];var _d=false;var _e=false;var _4;function handleBackButton(){var _f=_c.pop();if(!_f){return;}var _10=_c[_c.length-1];if(!_10&&_c.length==0){_10=_7;}if(_10){if(_10.kwArgs["back"]){_10.kwArgs["back"]();}else{if(_10.kwArgs["backButton"]){_10.kwArgs["backButton"]();}else{if(_10.kwArgs["handle"]){_10.kwArgs.handle("back");}}}}_b.push(_f);};_1.goBack=handleBackButton;function handleForwardButton(){var _11=_b.pop();if(!_11){return;}if(_11.kwArgs["forward"]){_11.kwArgs.forward();}else{if(_11.kwArgs["forwardButton"]){_11.kwArgs.forwardButton();}else{if(_11.kwArgs["handle"]){_11.kwArgs.handle("forward");}}}_c.push(_11);};_1.goForward=handleForwardButton;function createState(url,_13,_14){return {"url":url,"kwArgs":_13,"urlHash":_14};};function getUrlQuery(url){var _16=url.split("?");if(_16.length<2){return null;}else{return _16[1];}};function loadIframeHistory(){var url=(dojo.config["dojoIframeHistoryUrl"]||dojo.moduleUrl("dojo","resources/iframe_history.html"))+"?"+(new Date()).getTime();_d=true;if(_a){dojo.isSafari?_a.location=url:window.frames[_a.name].location=url;}else{}return url;};function checkLocation(){if(!_e){var hsl=_c.length;var _19=getHash();if((_19===_6||window.location.href==_5)&&(hsl==1)){handleBackButton();return;}if(_b.length>0){if(_b[_b.length-1].urlHash===_19){handleForwardButton();return;}}if((hsl>=2)&&(_c[hsl-2])){if(_c[hsl-2].urlHash===_19){handleBackButton();return;}}if(dojo.isSafari&&dojo.isSafari<3){var _1a=history.length;if(_1a>_4){handleForwardButton();}else{if(_1a<_4){handleBackButton();}}_4=_1a;}}};_1.init=function(){if(dojo.byId("dj_history")){return;}var src=dojo.config["dojoIframeHistoryUrl"]||dojo.moduleUrl("dojo","resources/iframe_history.html");document.write("");};_1.setInitialState=function(_1c){_7=createState(_5,_1c,_6);};_1.addToHistory=function(_1d){_b=[];var _1e=null;var url=null;if(!_a){if(dojo.config["useXDomain"]&&!dojo.config["dojoIframeHistoryUrl"]){console.warn("dojo.back: When using cross-domain Dojo builds,"+" please save iframe_history.html to your domain and set djConfig.dojoIframeHistoryUrl"+" to the path on your domain to iframe_history.html");}_a=window.frames["dj_history"];}if(!_9){_9=document.createElement("a");dojo.body().appendChild(_9);_9.style.display="none";}if(_1d["changeUrl"]){_1e=""+((_1d["changeUrl"]!==true)?_1d["changeUrl"]:(new Date()).getTime());if(_c.length==0&&_7.urlHash==_1e){_7=createState(url,_1d,_1e);return;}else{if(_c.length>0&&_c[_c.length-1].urlHash==_1e){_c[_c.length-1]=createState(url,_1d,_1e);return;}}_e=true;setTimeout(function(){setHash(_1e);_e=false;},1);_9.href=_1e;if(dojo.isIE){url=loadIframeHistory();var _20=_1d["back"]||_1d["backButton"]||_1d["handle"];var tcb=function(_22){if(getHash()!=""){setTimeout(function(){setHash(_1e);},1);}_20.apply(this,[_22]);};if(_1d["back"]){_1d.back=tcb;}else{if(_1d["backButton"]){_1d.backButton=tcb;}else{if(_1d["handle"]){_1d.handle=tcb;}}}var _23=_1d["forward"]||_1d["forwardButton"]||_1d["handle"];var tfw=function(_25){if(getHash()!=""){setHash(_1e);}if(_23){_23.apply(this,[_25]);}};if(_1d["forward"]){_1d.forward=tfw;}else{if(_1d["forwardButton"]){_1d.forwardButton=tfw;}else{if(_1d["handle"]){_1d.handle=tfw;}}}}else{if(!dojo.isIE){if(!_8){_8=setInterval(checkLocation,200);}}}}else{url=loadIframeHistory();}_c.push(createState(url,_1d,_1e));};_1._iframeLoaded=function(evt,_27){var _28=getUrlQuery(_27.href);if(_28==null){if(_c.length==1){handleBackButton();}return;}if(_d){_d=false;return;}if(_c.length>=2&&_28==getUrlQuery(_c[_c.length-2].url)){handleBackButton();}else{if(_b.length>0&&_28==getUrlQuery(_b[_b.length-1].url)){handleForwardButton();}}};})();} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/behavior.js b/spring-js/src/main/resources/META-INF/dojo/behavior.js index bb4a1ef3..1ab14e00 100644 --- a/spring-js/src/main/resources/META-INF/dojo/behavior.js +++ b/spring-js/src/main/resources/META-INF/dojo/behavior.js @@ -1,11 +1,7 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ diff --git a/spring-js/src/main/resources/META-INF/dojo/build.txt b/spring-js/src/main/resources/META-INF/dojo/build.txt index 2be514a0..dd0b9349 100644 --- a/spring-js/src/main/resources/META-INF/dojo/build.txt +++ b/spring-js/src/main/resources/META-INF/dojo/build.txt @@ -5,7 +5,6 @@ dojo.js: ./../../dojo/_base/_loader/bootstrap.js ./../../dojo/_base/_loader/loader.js ./../../dojo/_base/_loader/hostenv_browser.js -./jslib/dojoGuardEnd.jsfrag ./../../release/dojo/dojo/_base/lang.js ./../../release/dojo/dojo/_base/declare.js ./../../release/dojo/dojo/_base/connect.js @@ -21,15 +20,16 @@ dojo.js: ./../../release/dojo/dojo/_base/query.js ./../../release/dojo/dojo/_base/xhr.js ./../../release/dojo/dojo/_base/fx.js +./../../release/dojo/dojo/_base/browser.js ./../../release/dojo/dojo/i18n.js ./../../release/dojo/dijit/_base/focus.js ./../../release/dojo/dijit/_base/manager.js +./../../release/dojo/dojo/AdapterRegistry.js ./../../release/dojo/dijit/_base/place.js ./../../release/dojo/dijit/_base/window.js ./../../release/dojo/dijit/_base/popup.js ./../../release/dojo/dijit/_base/scroll.js ./../../release/dojo/dijit/_base/sniff.js -./../../release/dojo/dijit/_base/bidi.js ./../../release/dojo/dijit/_base/typematic.js ./../../release/dojo/dijit/_base/wai.js ./../../release/dojo/dijit/_base.js @@ -49,8 +49,7 @@ dojo.js: ./../../release/dojo/dojo/date.js ./../../release/dojo/dojo/date/locale.js ./../../release/dojo/dijit/_Calendar.js -./../../release/dojo/dijit/_TimePicker.js -./../../release/dojo/dijit/form/TimeTextBox.js +./../../release/dojo/dijit/form/_DateTimeTextBox.js ./../../release/dojo/dijit/form/DateTextBox.js ./../../release/dojo/dojo/cldr/monetary.js ./../../release/dojo/dojo/currency.js @@ -60,9 +59,12 @@ dojo.js: ./../../release/dojo/dojo/dnd/Mover.js ./../../release/dojo/dojo/dnd/Moveable.js ./../../release/dojo/dojo/dnd/move.js +./../../release/dojo/dojo/dnd/TimedMoveable.js ./../../release/dojo/dojo/fx.js ./../../release/dojo/dijit/_Container.js ./../../release/dojo/dijit/layout/_LayoutWidget.js +./../../release/dojo/dojo/html.js ./../../release/dojo/dijit/layout/ContentPane.js ./../../release/dojo/dijit/form/Form.js ./../../release/dojo/dijit/Dialog.js +./jslib/dojoGuardEnd.jsfrag diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/monetary.js b/spring-js/src/main/resources/META-INF/dojo/cldr/monetary.js index ec0d1200..50aeffc7 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/monetary.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/monetary.js @@ -1,11 +1,7 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/currency.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/currency.js index fb0b871f..742b390e 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/currency.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/currency.js @@ -1 +1 @@ -({"USD_symbol": "$", "EUR_displayName": "EUR", "GBP_displayName": "GBP", "JPY_displayName": "JPY", "GBP_symbol": "£", "JPY_symbol": "¥", "EUR_symbol": "€", "USD_displayName": "USD"}) \ No newline at end of file +({"USD_symbol":"US$","EUR_displayName":"EUR","GBP_displayName":"GBP","JPY_displayName":"JPY","GBP_symbol":"UK£","JPY_symbol":"JP¥","EUR_symbol":"€","USD_displayName":"USD"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/de-de/number.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/de-de/number.js index f660e080..e6005066 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/de-de/number.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/de-de/number.js @@ -1 +1 @@ -({"currencyFormat": "#,##0.00 ¤", "group": ".", "percentFormat": "#,##0 %", "decimal": ",", "scientificFormat": "#E0", "currencySpacing-afterCurrency-currencyMatch": "[:letter:]", "infinity": "∞", "list": ";", "percentSign": "%", "minusSign": "-", "currencySpacing-beforeCurrency-surroundingMatch": "[:digit:]", "currencySpacing-afterCurrency-insertBetween": " ", "nan": "NaN", "nativeZeroDigit": "0", "plusSign": "+", "currencySpacing-afterCurrency-surroundingMatch": "[:digit:]", "currencySpacing-beforeCurrency-currencyMatch": "[:letter:]", "perMille": "‰", "decimalFormat": "#,##0.###", "patternDigit": "#", "currencySpacing-beforeCurrency-insertBetween": " ", "exponential": "E"}) \ No newline at end of file +({"currencyFormat":"#,##0.00 ¤","group":".","percentSign":"%","exponential":"E","percentFormat":"#,##0 %","scientificFormat":"#E0","list":";","infinity":"∞","patternDigit":"#","minusSign":"-","decimal":",","nan":"NaN","nativeZeroDigit":"0","perMille":"‰","decimalFormat":"#,##0.###","plusSign":"+","currencySpacing-afterCurrency-currencyMatch":"[:letter:]","currencySpacing-beforeCurrency-surroundingMatch":"[:digit:]","currencySpacing-afterCurrency-insertBetween":" ","currencySpacing-afterCurrency-surroundingMatch":"[:digit:]","currencySpacing-beforeCurrency-currencyMatch":"[:letter:]","currencySpacing-beforeCurrency-insertBetween":" "}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/de/currency.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/de/currency.js index 28e843cc..56d66a6e 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/de/currency.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/de/currency.js @@ -1 +1 @@ -({"HKD_displayName": "Hongkong Dollar", "CHF_displayName": "Schweizer Franken", "CHF_symbol": "SFr.", "CAD_displayName": "Kanadischer Dollar", "AUD_displayName": "Australischer Dollar", "JPY_displayName": "Yen", "USD_displayName": "US Dollar", "GBP_displayName": "Pfund Sterling", "EUR_displayName": "Euro", "USD_symbol": "$", "GBP_symbol": "£", "JPY_symbol": "¥", "EUR_symbol": "€"}) \ No newline at end of file +({"HKD_displayName":"Hongkong-Dollar","CHF_displayName":"Schweizer Franken","CHF_symbol":"SFr.","JPY_symbol":"¥","CAD_displayName":"Kanadischer Dollar","CNY_displayName":"Renminbi Yuan","USD_symbol":"$","AUD_displayName":"Australischer Dollar","JPY_displayName":"Yen","CAD_symbol":"Can$","USD_displayName":"US-Dollar","CNY_symbol":"Y","GBP_displayName":"Pfund Sterling","GBP_symbol":"£","AUD_symbol":"$A","EUR_displayName":"Euro","EUR_symbol":"€"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/de/gregorian.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/de/gregorian.js index 6b0aedd9..6426d5bf 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/de/gregorian.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/de/gregorian.js @@ -1 +1 @@ -({"eraNames": ["v. Chr.", "n. Chr."], "timeFormat-full": "H:mm' Uhr 'z", "eraAbbr": ["v. Chr.", "n. Chr."], "dateFormat-medium": "dd.MM.yyyy", "am": "vorm.", "months-format-abbr": ["Jan", "Feb", "Mrz", "Apr", "Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Dez"], "dateFormat-full": "EEEE, d. MMMM yyyy", "days-format-abbr": ["So", "Mo", "Di", "Mi", "Do", "Fr", "Sa"], "quarters-format-wide": ["1. Quartal", "2. Quartal", "3. Quartal", "4. Quartal"], "pm": "nachm.", "dateFormat-short": "dd.MM.yy", "months-format-wide": ["Januar", "Februar", "März", "April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", "Dezember"], "months-standAlone-narrow": ["J", "F", "M", "A", "M", "J", "J", "A", "S", "O", "N", "D"], "days-standAlone-narrow": ["S", "M", "D", "M", "D", "F", "S"], "dateFormat-long": "d. MMMM yyyy", "days-format-wide": ["Sonntag", "Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag"], "dateTimeFormats-appendItem-Second": "{0} ({2}: {1})", "field-dayperiod": "Dayperiod", "field-minute": "Minute", "field-weekday": "Day of the Week", "dateTimeFormats-appendItem-Year": "{0} {1}", "field-era": "Era", "field-hour": "Hour", "dateTimeFormats-appendItem-Week": "{0} ({2}: {1})", "dateTimeFormats-appendItem-Timezone": "{0} {1}", "dateTimeFormats-appendItem-Month": "{0} ({2}: {1})", "timeFormat-medium": "HH:mm:ss", "field-zone": "Zone", "dateTimeFormats-appendItem-Minute": "{0} ({2}: {1})", "quarters-format-abbreviated": ["Q1", "Q2", "Q3", "Q4"], "dateTimeFormat": "{1} {0}", "field-year": "Year", "dateTimeFormats-appendItem-Day": "{0} ({2}: {1})", "field-week": "Week", "timeFormat-long": "HH:mm:ss z", "timeFormat-short": "HH:mm", "field-month": "Month", "dateTimeFormats-appendItem-Quarter": "{0} ({2}: {1})", "field-second": "Second", "field-day": "Day", "dateTimeFormats-appendItem-Day-Of-Week": "{0} {1}", "dateTimeFormats-appendItem-Hour": "{0} ({2}: {1})", "dateTimeFormats-appendItem-Era": "{0} {1}"}) \ No newline at end of file +({"field-dayperiod":"Tageshälfte","field-minute":"Minute","eraNames":["v. Chr.","n. Chr."],"field-weekday":"Wochentag","days-standAlone-wide":["Sonntag","Montag","Dienstag","Mittwoch","Donnerstag","Freitag","Samstag"],"months-standAlone-narrow":["J","F","M","A","M","J","J","A","S","O","N","D"],"field-era":"Epoche","field-hour":"Stunde","timeFormat-full":"HH:mm:ss v","months-standAlone-abbr":["Jan","Feb","Mär","Apr","Mai","Jun","Jul","Aug","Sep","Okt","Nov","Dez"],"days-standAlone-narrow":["S","M","D","M","D","F","S"],"eraAbbr":["v. Chr.","n. Chr."],"dateFormat-long":"d. MMMM yyyy","timeFormat-medium":"HH:mm:ss","field-zone":"Zone","dateFormat-medium":"dd.MM.yyyy","quarters-standAlone-wide":["1. Quartal","2. Quartal","3. Quartal","4. Quartal"],"dateTimeFormat":"{1} {0}","field-year":"Jahr","quarters-standAlone-narrow":["1","2","3","4"],"months-standAlone-wide":["Januar","Februar","März","April","Mai","Juni","Juli","August","September","Oktober","November","Dezember"],"field-week":"Woche","timeFormat-long":"HH:mm:ss z","months-format-abbr":["Jan","Feb","Mrz","Apr","Mai","Jun","Jul","Aug","Sep","Okt","Nov","Dez"],"timeFormat-short":"HH:mm","field-month":"Monat","quarters-format-abbr":["Q1","Q2","Q3","Q4"],"days-format-abbr":["So.","Mo.","Di.","Mi.","Do.","Fr.","Sa."],"pm":"nachm.","days-format-narrow":["S","M","D","M","D","F","S"],"field-second":"Sekunde","field-day":"Tag","months-format-narrow":["J","F","M","A","M","J","J","A","S","O","N","D"],"am":"vorm.","days-standAlone-abbr":["So.","Mo.","Di.","Mi.","Do.","Fr.","Sa."],"dateFormat-short":"dd.MM.yy","dateFormat-full":"EEEE, d. MMMM yyyy","months-format-wide":["Januar","Februar","März","April","Mai","Juni","Juli","August","September","Oktober","November","Dezember"],"dateTimeAvailableFormats":["E d.","H","HH:mm","HH:mm:ss","H:mm","L","E, d.M.","LLL","E d. MMM","E d. MMMM","d. MMMM","dd. MMMM","d. MMM","d.MM.","dd.MM.","d.M.","d","HH:mm","HH:mm:ss","mm:ss","mm:ss","yyyy","yyyy-M","EEE, yyyy-M-d","MMM yyyy","EEE, d. MMM yyyy","MMMM yyyy","Q yyyy","QQQ yyyy","MM.yy","MMM yy","dd.MM.yy","Q yy","QQQQ yy","yyyy","MMMM yyyy"],"quarters-format-wide":["1. Quartal","2. Quartal","3. Quartal","4. Quartal"],"days-format-wide":["Sonntag","Montag","Dienstag","Mittwoch","Donnerstag","Freitag","Samstag"],"eraNarrow":["v. Chr.","n. Chr."],"dateTimeFormats-appendItem-Second":"{0} ({2}: {1})","dateTimeFormats-appendItem-Year":"{0} {1}","quarters-standAlone-abbr":["Q1","Q2","Q3","Q4"],"dateTimeFormats-appendItem-Week":"{0} ({2}: {1})","dateTimeFormats-appendItem-Timezone":"{0} {1}","dateTimeFormats-appendItem-Month":"{0} ({2}: {1})","dateTimeFormats-appendItem-Minute":"{0} ({2}: {1})","dateTimeFormats-appendItem-Day":"{0} ({2}: {1})","quarters-format-narrow":["1","2","3","4"],"dateTimeFormats-appendItem-Quarter":"{0} ({2}: {1})","dateTimeFormats-appendItem-Day-Of-Week":"{0} {1}","dateTimeFormats-appendItem-Hour":"{0} ({2}: {1})","dateTimeFormats-appendItem-Era":"{0} {1}"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/de/number.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/de/number.js index 4e218a3d..90861a09 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/de/number.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/de/number.js @@ -1 +1 @@ -({"group": ".", "percentFormat": "#,##0 %", "decimal": ",", "scientificFormat": "#E0", "currencySpacing-afterCurrency-currencyMatch": "[:letter:]", "infinity": "∞", "list": ";", "percentSign": "%", "minusSign": "-", "currencySpacing-beforeCurrency-surroundingMatch": "[:digit:]", "currencySpacing-afterCurrency-insertBetween": " ", "nan": "NaN", "nativeZeroDigit": "0", "plusSign": "+", "currencySpacing-afterCurrency-surroundingMatch": "[:digit:]", "currencyFormat": "¤ #,##0.00", "currencySpacing-beforeCurrency-currencyMatch": "[:letter:]", "perMille": "‰", "decimalFormat": "#,##0.###", "patternDigit": "#", "currencySpacing-beforeCurrency-insertBetween": " ", "exponential": "E"}) \ No newline at end of file +({"group":".","percentSign":"%","exponential":"E","percentFormat":"#,##0 %","scientificFormat":"#E0","list":";","infinity":"∞","patternDigit":"#","minusSign":"-","decimal":",","nan":"NaN","nativeZeroDigit":"0","perMille":"‰","decimalFormat":"#,##0.###","currencyFormat":"#,##0.00 ¤","plusSign":"+","currencySpacing-afterCurrency-currencyMatch":"[:letter:]","currencySpacing-beforeCurrency-surroundingMatch":"[:digit:]","currencySpacing-afterCurrency-insertBetween":" ","currencySpacing-afterCurrency-surroundingMatch":"[:digit:]","currencySpacing-beforeCurrency-currencyMatch":"[:letter:]","currencySpacing-beforeCurrency-insertBetween":" "}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en-au/currency.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en-au/currency.js index 37be72f9..c9caa433 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en-au/currency.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en-au/currency.js @@ -1 +1 @@ -({"AUD_symbol": "$", "HKD_displayName": "Hong Kong Dollar", "CHF_displayName": "Swiss Franc", "CHF_symbol": "SwF", "HKD_symbol": "HK$", "CAD_displayName": "Canadian Dollar", "USD_symbol": "US$", "AUD_displayName": "Australian Dollar", "JPY_displayName": "Japanese Yen", "CAD_symbol": "Can$", "USD_displayName": "US Dollar", "GBP_displayName": "British Pound Sterling", "EUR_displayName": "Euro", "GBP_symbol": "£", "JPY_symbol": "¥", "EUR_symbol": "€"}) \ No newline at end of file +({"AUD_symbol":"$","USD_symbol":"US$","HKD_displayName":"Hong Kong Dollar","CHF_displayName":"Swiss Franc","CHF_symbol":"Fr.","JPY_symbol":"¥","HKD_symbol":"HK$","CAD_displayName":"Canadian Dollar","CNY_displayName":"Chinese Yuan Renminbi","AUD_displayName":"Australian Dollar","JPY_displayName":"Japanese Yen","CAD_symbol":"CA$","USD_displayName":"US Dollar","CNY_symbol":"RMB","GBP_displayName":"British Pound Sterling","GBP_symbol":"£","EUR_displayName":"Euro","EUR_symbol":"€"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en-au/gregorian.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en-au/gregorian.js index 1571f942..20972709 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en-au/gregorian.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en-au/gregorian.js @@ -1 +1 @@ -({"dateFormat-short": "d/MM/yy", "timeFormat-long": "h:mm:ss a", "dateFormat-medium": "dd/MM/yyyy", "dateFormat-long": "d MMMM yyyy", "dateFormat-full": "EEEE, d MMMM yyyy", "timeFormat-full": "h:mm:ss a v", "months-standAlone-narrow": ["J", "F", "M", "A", "M", "J", "J", "A", "S", "O", "N", "D"], "eraNames": ["Before Christ", "Anno Domini"], "days-standAlone-narrow": ["S", "M", "T", "W", "T", "F", "S"], "timeFormat-medium": "h:mm:ss a", "field-dayperiod": "AM/PM", "months-format-wide": ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"], "timeFormat-short": "h:mm a", "months-format-abbr": ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"], "days-format-wide": ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"], "eraAbbr": ["BC", "AD"], "quarters-format-wide": ["1st quarter", "2nd quarter", "3rd quarter", "4th quarter"], "days-format-abbr": ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"], "dateTimeFormats-appendItem-Second": "{0} ({2}: {1})", "field-minute": "Minute", "field-weekday": "Day of the Week", "dateTimeFormats-appendItem-Year": "{0} {1}", "field-era": "Era", "field-hour": "Hour", "dateTimeFormats-appendItem-Week": "{0} ({2}: {1})", "dateTimeFormats-appendItem-Timezone": "{0} {1}", "dateTimeFormats-appendItem-Month": "{0} ({2}: {1})", "field-zone": "Zone", "dateTimeFormats-appendItem-Minute": "{0} ({2}: {1})", "quarters-format-abbreviated": ["Q1", "Q2", "Q3", "Q4"], "dateTimeFormat": "{1} {0}", "field-year": "Year", "dateTimeFormats-appendItem-Day": "{0} ({2}: {1})", "field-week": "Week", "field-month": "Month", "dateTimeFormats-appendItem-Quarter": "{0} ({2}: {1})", "pm": "PM", "field-second": "Second", "field-day": "Day", "dateTimeFormats-appendItem-Day-Of-Week": "{0} {1}", "dateTimeFormats-appendItem-Hour": "{0} ({2}: {1})", "am": "AM", "dateTimeFormats-appendItem-Era": "{0} {1}"}) \ No newline at end of file +({"dateTimeAvailableFormats":["d MMMM","dd/MM","MM/yyyy","MMMM yyyy","LLL","E, MMM d","E, MMMM d","MMMM d","MMM d","M/d","d","h:mm a","mm:ss","yyyy","M/yyyy","EEE, M/d/yyyy","MMM yyyy","EEE, MMM d, yyyy","MMMM yyyy","Q yyyy","QQQ yyyy"],"dateFormat-short":"d/MM/yy","dateFormat-medium":"dd/MM/yyyy","dateFormat-long":"d MMMM yyyy","dateFormat-full":"EEEE, d MMMM yyyy","field-dayperiod":"AM/PM","field-minute":"Minute","eraNames":["Before Christ","Anno Domini"],"field-weekday":"Day of the Week","days-standAlone-wide":["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],"months-standAlone-narrow":["J","F","M","A","M","J","J","A","S","O","N","D"],"field-era":"Era","field-hour":"Hour","timeFormat-full":"h:mm:ss a v","months-standAlone-abbr":["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],"days-standAlone-narrow":["S","M","T","W","T","F","S"],"eraAbbr":["BC","AD"],"timeFormat-medium":"h:mm:ss a","field-zone":"Zone","quarters-standAlone-wide":["1st quarter","2nd quarter","3rd quarter","4th quarter"],"dateTimeFormat":"{1} {0}","field-year":"Year","quarters-standAlone-narrow":["1","2","3","4"],"months-standAlone-wide":["January","February","March","April","May","June","July","August","September","October","November","December"],"field-week":"Week","timeFormat-long":"h:mm:ss a z","months-format-abbr":["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],"timeFormat-short":"h:mm a","field-month":"Month","quarters-format-abbr":["Q1","Q2","Q3","Q4"],"days-format-abbr":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],"pm":"p.m.","days-format-narrow":["S","M","T","W","T","F","S"],"field-second":"Second","field-day":"Day","months-format-narrow":["J","F","M","A","M","J","J","A","S","O","N","D"],"am":"a.m.","days-standAlone-abbr":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],"months-format-wide":["January","February","March","April","May","June","July","August","September","October","November","December"],"quarters-format-wide":["1st quarter","2nd quarter","3rd quarter","4th quarter"],"days-format-wide":["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],"eraNarrow":["B","A"],"dateTimeFormats-appendItem-Second":"{0} ({2}: {1})","dateTimeFormats-appendItem-Year":"{0} {1}","quarters-standAlone-abbr":["Q1","Q2","Q3","Q4"],"dateTimeFormats-appendItem-Week":"{0} ({2}: {1})","dateTimeFormats-appendItem-Timezone":"{0} {1}","dateTimeFormats-appendItem-Month":"{0} ({2}: {1})","dateTimeFormats-appendItem-Minute":"{0} ({2}: {1})","dateTimeFormats-appendItem-Day":"{0} ({2}: {1})","quarters-format-narrow":["1","2","3","4"],"dateTimeFormats-appendItem-Quarter":"{0} ({2}: {1})","dateTimeFormats-appendItem-Day-Of-Week":"{0} {1}","dateTimeFormats-appendItem-Hour":"{0} ({2}: {1})","dateTimeFormats-appendItem-Era":"{0} {1}"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en-au/number.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en-au/number.js index a2232796..748ea804 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en-au/number.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en-au/number.js @@ -1 +1 @@ -({"currencyFormat":"¤#,##0.00","group":",","decimal":".","scientificFormat":"#E0","currencySpacing-afterCurrency-currencyMatch":"[:letter:]","infinity":"∞","list":";","percentSign":"%","minusSign":"-","currencySpacing-beforeCurrency-surroundingMatch":"[:digit:]","currencySpacing-afterCurrency-insertBetween":" ","nan":"NaN","nativeZeroDigit":"0","plusSign":"+","currencySpacing-afterCurrency-surroundingMatch":"[:digit:]","currencySpacing-beforeCurrency-currencyMatch":"[:letter:]","perMille":"‰","percentFormat":"#,##0%","decimalFormat":"#,##0.###","patternDigit":"#","currencySpacing-beforeCurrency-insertBetween":" ","exponential":"E"}) \ No newline at end of file +({"currencyFormat":"¤#,##0.00","group":",","percentSign":"%","exponential":"E","percentFormat":"#,##0%","scientificFormat":"#E0","list":";","infinity":"∞","patternDigit":"#","minusSign":"-","decimal":".","nan":"NaN","nativeZeroDigit":"0","perMille":"‰","decimalFormat":"#,##0.###","plusSign":"+","currencySpacing-afterCurrency-currencyMatch":"[:letter:]","currencySpacing-beforeCurrency-surroundingMatch":"[:digit:]","currencySpacing-afterCurrency-insertBetween":" ","currencySpacing-afterCurrency-surroundingMatch":"[:digit:]","currencySpacing-beforeCurrency-currencyMatch":"[:letter:]","currencySpacing-beforeCurrency-insertBetween":" "}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en-ca/currency.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en-ca/currency.js index 9d6a083a..516b0e13 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en-ca/currency.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en-ca/currency.js @@ -1 +1 @@ -({"CAD_symbol": "$", "HKD_displayName": "Hong Kong Dollar", "CHF_displayName": "Swiss Franc", "CHF_symbol": "SwF", "HKD_symbol": "HK$", "CAD_displayName": "Canadian Dollar", "USD_symbol": "US$", "AUD_displayName": "Australian Dollar", "JPY_displayName": "Japanese Yen", "USD_displayName": "US Dollar", "GBP_displayName": "British Pound Sterling", "AUD_symbol": "$A", "EUR_displayName": "Euro", "GBP_symbol": "£", "JPY_symbol": "¥", "EUR_symbol": "€"}) \ No newline at end of file +({"CAD_symbol":"$","USD_symbol":"US$","HKD_displayName":"Hong Kong Dollar","CHF_displayName":"Swiss Franc","CHF_symbol":"Fr.","JPY_symbol":"¥","HKD_symbol":"HK$","CAD_displayName":"Canadian Dollar","CNY_displayName":"Chinese Yuan Renminbi","AUD_displayName":"Australian Dollar","JPY_displayName":"Japanese Yen","USD_displayName":"US Dollar","CNY_symbol":"RMB","GBP_displayName":"British Pound Sterling","GBP_symbol":"£","AUD_symbol":"A$","EUR_displayName":"Euro","EUR_symbol":"€"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en-ca/gregorian.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en-ca/gregorian.js index ef18ca5b..3141ad91 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en-ca/gregorian.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en-ca/gregorian.js @@ -1 +1 @@ -({"dateFormat-medium": "d-MMM-yy", "dateFormat-short": "dd/MM/yy", "timeFormat-full": "h:mm:ss a v", "months-standAlone-narrow": ["J", "F", "M", "A", "M", "J", "J", "A", "S", "O", "N", "D"], "eraNames": ["Before Christ", "Anno Domini"], "days-standAlone-narrow": ["S", "M", "T", "W", "T", "F", "S"], "timeFormat-medium": "h:mm:ss a", "dateFormat-long": "MMMM d, yyyy", "field-dayperiod": "AM/PM", "months-format-wide": ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"], "timeFormat-short": "h:mm a", "months-format-abbr": ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"], "days-format-wide": ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"], "timeFormat-long": "h:mm:ss a z", "eraAbbr": ["BC", "AD"], "quarters-format-wide": ["1st quarter", "2nd quarter", "3rd quarter", "4th quarter"], "dateFormat-full": "EEEE, MMMM d, yyyy", "days-format-abbr": ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"], "dateTimeFormats-appendItem-Second": "{0} ({2}: {1})", "field-minute": "Minute", "field-weekday": "Day of the Week", "dateTimeFormats-appendItem-Year": "{0} {1}", "field-era": "Era", "field-hour": "Hour", "dateTimeFormats-appendItem-Week": "{0} ({2}: {1})", "dateTimeFormats-appendItem-Timezone": "{0} {1}", "dateTimeFormats-appendItem-Month": "{0} ({2}: {1})", "field-zone": "Zone", "dateTimeFormats-appendItem-Minute": "{0} ({2}: {1})", "quarters-format-abbreviated": ["Q1", "Q2", "Q3", "Q4"], "dateTimeFormat": "{1} {0}", "field-year": "Year", "dateTimeFormats-appendItem-Day": "{0} ({2}: {1})", "field-week": "Week", "field-month": "Month", "dateTimeFormats-appendItem-Quarter": "{0} ({2}: {1})", "pm": "PM", "field-second": "Second", "field-day": "Day", "dateTimeFormats-appendItem-Day-Of-Week": "{0} {1}", "dateTimeFormats-appendItem-Hour": "{0} ({2}: {1})", "am": "AM", "dateTimeFormats-appendItem-Era": "{0} {1}"}) \ No newline at end of file +({"dateFormat-medium":"yyyy-MM-dd","dateTimeAvailableFormats":["MM-dd","MMM-yy","L","E, M/d","LLL","E, MMM d","E, MMMM d","MMMM d","MMM d","M/d","d","h:mm a","mm:ss","yyyy","M/yyyy","EEE, M/d/yyyy","MMM yyyy","EEE, MMM d, yyyy","MMMM yyyy","Q yyyy","QQQ yyyy"],"dateFormat-short":"yy-MM-dd","field-dayperiod":"AM/PM","field-minute":"Minute","eraNames":["Before Christ","Anno Domini"],"field-weekday":"Day of the Week","days-standAlone-wide":["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],"months-standAlone-narrow":["J","F","M","A","M","J","J","A","S","O","N","D"],"field-era":"Era","field-hour":"Hour","timeFormat-full":"h:mm:ss a v","months-standAlone-abbr":["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],"days-standAlone-narrow":["S","M","T","W","T","F","S"],"eraAbbr":["BC","AD"],"dateFormat-long":"MMMM d, yyyy","timeFormat-medium":"h:mm:ss a","field-zone":"Zone","quarters-standAlone-wide":["1st quarter","2nd quarter","3rd quarter","4th quarter"],"dateTimeFormat":"{1} {0}","field-year":"Year","quarters-standAlone-narrow":["1","2","3","4"],"months-standAlone-wide":["January","February","March","April","May","June","July","August","September","October","November","December"],"field-week":"Week","timeFormat-long":"h:mm:ss a z","months-format-abbr":["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],"timeFormat-short":"h:mm a","field-month":"Month","quarters-format-abbr":["Q1","Q2","Q3","Q4"],"days-format-abbr":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],"pm":"p.m.","days-format-narrow":["S","M","T","W","T","F","S"],"field-second":"Second","field-day":"Day","months-format-narrow":["J","F","M","A","M","J","J","A","S","O","N","D"],"am":"a.m.","days-standAlone-abbr":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],"dateFormat-full":"EEEE, MMMM d, yyyy","months-format-wide":["January","February","March","April","May","June","July","August","September","October","November","December"],"quarters-format-wide":["1st quarter","2nd quarter","3rd quarter","4th quarter"],"days-format-wide":["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],"eraNarrow":["B","A"],"dateTimeFormats-appendItem-Second":"{0} ({2}: {1})","dateTimeFormats-appendItem-Year":"{0} {1}","quarters-standAlone-abbr":["Q1","Q2","Q3","Q4"],"dateTimeFormats-appendItem-Week":"{0} ({2}: {1})","dateTimeFormats-appendItem-Timezone":"{0} {1}","dateTimeFormats-appendItem-Month":"{0} ({2}: {1})","dateTimeFormats-appendItem-Minute":"{0} ({2}: {1})","dateTimeFormats-appendItem-Day":"{0} ({2}: {1})","quarters-format-narrow":["1","2","3","4"],"dateTimeFormats-appendItem-Quarter":"{0} ({2}: {1})","dateTimeFormats-appendItem-Day-Of-Week":"{0} {1}","dateTimeFormats-appendItem-Hour":"{0} ({2}: {1})","dateTimeFormats-appendItem-Era":"{0} {1}"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en-gb/gregorian.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en-gb/gregorian.js index 355a0f49..1c22155d 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en-gb/gregorian.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en-gb/gregorian.js @@ -1 +1 @@ -({"dateFormat-short": "dd/MM/yyyy", "timeFormat-long": "HH:mm:ss z", "dateFormat-medium": "d MMM yyyy", "dateFormat-long": "d MMMM yyyy", "timeFormat-medium": "HH:mm:ss", "timeFormat-short": "HH:mm", "timeFormat-full": "HH:mm:ss z", "dateFormat-full": "EEEE, d MMMM yyyy", "months-standAlone-narrow": ["J", "F", "M", "A", "M", "J", "J", "A", "S", "O", "N", "D"], "eraNames": ["Before Christ", "Anno Domini"], "days-standAlone-narrow": ["S", "M", "T", "W", "T", "F", "S"], "field-dayperiod": "AM/PM", "months-format-wide": ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"], "months-format-abbr": ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"], "days-format-wide": ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"], "eraAbbr": ["BC", "AD"], "quarters-format-wide": ["1st quarter", "2nd quarter", "3rd quarter", "4th quarter"], "days-format-abbr": ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"], "dateTimeFormats-appendItem-Second": "{0} ({2}: {1})", "field-minute": "Minute", "field-weekday": "Day of the Week", "dateTimeFormats-appendItem-Year": "{0} {1}", "field-era": "Era", "field-hour": "Hour", "dateTimeFormats-appendItem-Week": "{0} ({2}: {1})", "dateTimeFormats-appendItem-Timezone": "{0} {1}", "dateTimeFormats-appendItem-Month": "{0} ({2}: {1})", "field-zone": "Zone", "dateTimeFormats-appendItem-Minute": "{0} ({2}: {1})", "quarters-format-abbreviated": ["Q1", "Q2", "Q3", "Q4"], "dateTimeFormat": "{1} {0}", "field-year": "Year", "dateTimeFormats-appendItem-Day": "{0} ({2}: {1})", "field-week": "Week", "field-month": "Month", "dateTimeFormats-appendItem-Quarter": "{0} ({2}: {1})", "pm": "PM", "field-second": "Second", "field-day": "Day", "dateTimeFormats-appendItem-Day-Of-Week": "{0} {1}", "dateTimeFormats-appendItem-Hour": "{0} ({2}: {1})", "am": "AM", "dateTimeFormats-appendItem-Era": "{0} {1}"}) \ No newline at end of file +({"dateTimeAvailableFormats":["E, d/M","E d MMM","d MMMM","dd/MM","d/M","EEE, d/M/yyyy","MMM yy","MM/yyyy","MMMM yyyy","M/d","d","h:mm a","mm:ss","yyyy","M/yyyy","EEE, M/d/yyyy","MMM yyyy","EEE, MMM d, yyyy","MMMM yyyy","Q yyyy","QQQ yyyy"],"timeFormat-full":"HH:mm:ss v","timeFormat-medium":"HH:mm:ss","dateFormat-medium":"d MMM yyyy","dateFormat-full":"EEEE, d MMMM yyyy","timeFormat-long":"HH:mm:ss z","timeFormat-short":"HH:mm","dateFormat-short":"dd/MM/yyyy","dateFormat-long":"d MMMM yyyy","field-dayperiod":"AM/PM","field-minute":"Minute","eraNames":["Before Christ","Anno Domini"],"field-weekday":"Day of the Week","days-standAlone-wide":["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],"months-standAlone-narrow":["J","F","M","A","M","J","J","A","S","O","N","D"],"field-era":"Era","field-hour":"Hour","months-standAlone-abbr":["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],"days-standAlone-narrow":["S","M","T","W","T","F","S"],"eraAbbr":["BC","AD"],"field-zone":"Zone","quarters-standAlone-wide":["1st quarter","2nd quarter","3rd quarter","4th quarter"],"dateTimeFormat":"{1} {0}","field-year":"Year","quarters-standAlone-narrow":["1","2","3","4"],"months-standAlone-wide":["January","February","March","April","May","June","July","August","September","October","November","December"],"field-week":"Week","months-format-abbr":["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],"field-month":"Month","quarters-format-abbr":["Q1","Q2","Q3","Q4"],"days-format-abbr":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],"pm":"p.m.","days-format-narrow":["S","M","T","W","T","F","S"],"field-second":"Second","field-day":"Day","months-format-narrow":["J","F","M","A","M","J","J","A","S","O","N","D"],"am":"a.m.","days-standAlone-abbr":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],"months-format-wide":["January","February","March","April","May","June","July","August","September","October","November","December"],"quarters-format-wide":["1st quarter","2nd quarter","3rd quarter","4th quarter"],"days-format-wide":["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],"eraNarrow":["B","A"],"dateTimeFormats-appendItem-Second":"{0} ({2}: {1})","dateTimeFormats-appendItem-Year":"{0} {1}","quarters-standAlone-abbr":["Q1","Q2","Q3","Q4"],"dateTimeFormats-appendItem-Week":"{0} ({2}: {1})","dateTimeFormats-appendItem-Timezone":"{0} {1}","dateTimeFormats-appendItem-Month":"{0} ({2}: {1})","dateTimeFormats-appendItem-Minute":"{0} ({2}: {1})","dateTimeFormats-appendItem-Day":"{0} ({2}: {1})","quarters-format-narrow":["1","2","3","4"],"dateTimeFormats-appendItem-Quarter":"{0} ({2}: {1})","dateTimeFormats-appendItem-Day-Of-Week":"{0} {1}","dateTimeFormats-appendItem-Hour":"{0} ({2}: {1})","dateTimeFormats-appendItem-Era":"{0} {1}"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en-gb/number.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en-gb/number.js index a2232796..748ea804 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en-gb/number.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en-gb/number.js @@ -1 +1 @@ -({"currencyFormat":"¤#,##0.00","group":",","decimal":".","scientificFormat":"#E0","currencySpacing-afterCurrency-currencyMatch":"[:letter:]","infinity":"∞","list":";","percentSign":"%","minusSign":"-","currencySpacing-beforeCurrency-surroundingMatch":"[:digit:]","currencySpacing-afterCurrency-insertBetween":" ","nan":"NaN","nativeZeroDigit":"0","plusSign":"+","currencySpacing-afterCurrency-surroundingMatch":"[:digit:]","currencySpacing-beforeCurrency-currencyMatch":"[:letter:]","perMille":"‰","percentFormat":"#,##0%","decimalFormat":"#,##0.###","patternDigit":"#","currencySpacing-beforeCurrency-insertBetween":" ","exponential":"E"}) \ No newline at end of file +({"currencyFormat":"¤#,##0.00","group":",","percentSign":"%","exponential":"E","percentFormat":"#,##0%","scientificFormat":"#E0","list":";","infinity":"∞","patternDigit":"#","minusSign":"-","decimal":".","nan":"NaN","nativeZeroDigit":"0","perMille":"‰","decimalFormat":"#,##0.###","plusSign":"+","currencySpacing-afterCurrency-currencyMatch":"[:letter:]","currencySpacing-beforeCurrency-surroundingMatch":"[:digit:]","currencySpacing-afterCurrency-insertBetween":" ","currencySpacing-afterCurrency-surroundingMatch":"[:digit:]","currencySpacing-beforeCurrency-currencyMatch":"[:letter:]","currencySpacing-beforeCurrency-insertBetween":" "}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en-us/currency.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en-us/currency.js index 195db8c1..ee32ca23 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en-us/currency.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en-us/currency.js @@ -1 +1 @@ -({"USD_symbol": "$", "HKD_displayName": "Hong Kong Dollar", "CHF_displayName": "Swiss Franc", "CHF_symbol": "SwF", "HKD_symbol": "HK$", "CAD_displayName": "Canadian Dollar", "AUD_displayName": "Australian Dollar", "JPY_displayName": "Japanese Yen", "CAD_symbol": "Can$", "USD_displayName": "US Dollar", "GBP_displayName": "British Pound Sterling", "AUD_symbol": "$A", "EUR_displayName": "Euro", "GBP_symbol": "£", "JPY_symbol": "¥", "EUR_symbol": "€"}) \ No newline at end of file +({"USD_symbol":"$","HKD_displayName":"Hong Kong Dollar","CHF_displayName":"Swiss Franc","CHF_symbol":"Fr.","JPY_symbol":"¥","HKD_symbol":"HK$","CAD_displayName":"Canadian Dollar","CNY_displayName":"Chinese Yuan Renminbi","AUD_displayName":"Australian Dollar","JPY_displayName":"Japanese Yen","CAD_symbol":"CA$","USD_displayName":"US Dollar","CNY_symbol":"RMB","GBP_displayName":"British Pound Sterling","GBP_symbol":"£","AUD_symbol":"A$","EUR_displayName":"Euro","EUR_symbol":"€"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en-us/number.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en-us/number.js index ad76e100..60522624 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en-us/number.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en-us/number.js @@ -1 +1 @@ -({"currencyFormat": "¤#,##0.00;(¤#,##0.00)", "scientificFormat": "#E0", "currencySpacing-afterCurrency-currencyMatch": "[:letter:]", "infinity": "∞", "list": ";", "percentSign": "%", "minusSign": "-", "currencySpacing-beforeCurrency-surroundingMatch": "[:digit:]", "currencySpacing-afterCurrency-insertBetween": " ", "nan": "NaN", "nativeZeroDigit": "0", "plusSign": "+", "currencySpacing-afterCurrency-surroundingMatch": "[:digit:]", "currencySpacing-beforeCurrency-currencyMatch": "[:letter:]", "perMille": "‰", "group": ",", "percentFormat": "#,##0%", "decimalFormat": "#,##0.###", "decimal": ".", "patternDigit": "#", "currencySpacing-beforeCurrency-insertBetween": " ", "exponential": "E"}) \ No newline at end of file +({"currencyFormat":"¤#,##0.00;(¤#,##0.00)","group":",","percentSign":"%","exponential":"E","percentFormat":"#,##0%","scientificFormat":"#E0","list":";","infinity":"∞","patternDigit":"#","minusSign":"-","decimal":".","nan":"NaN","nativeZeroDigit":"0","perMille":"‰","decimalFormat":"#,##0.###","plusSign":"+","currencySpacing-afterCurrency-currencyMatch":"[:letter:]","currencySpacing-beforeCurrency-surroundingMatch":"[:digit:]","currencySpacing-afterCurrency-insertBetween":" ","currencySpacing-afterCurrency-surroundingMatch":"[:digit:]","currencySpacing-beforeCurrency-currencyMatch":"[:letter:]","currencySpacing-beforeCurrency-insertBetween":" "}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en/currency.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en/currency.js index 9cfc6457..1be18a59 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en/currency.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en/currency.js @@ -1 +1 @@ -({"HKD_displayName": "Hong Kong Dollar", "CHF_displayName": "Swiss Franc", "CHF_symbol": "SwF", "HKD_symbol": "HK$", "CAD_displayName": "Canadian Dollar", "USD_symbol": "US$", "AUD_displayName": "Australian Dollar", "JPY_displayName": "Japanese Yen", "CAD_symbol": "Can$", "USD_displayName": "US Dollar", "GBP_displayName": "British Pound Sterling", "AUD_symbol": "$A", "EUR_displayName": "Euro", "GBP_symbol": "£", "JPY_symbol": "¥", "EUR_symbol": "€"}) \ No newline at end of file +({"HKD_displayName":"Hong Kong Dollar","CHF_displayName":"Swiss Franc","CHF_symbol":"Fr.","JPY_symbol":"¥","HKD_symbol":"HK$","CAD_displayName":"Canadian Dollar","CNY_displayName":"Chinese Yuan Renminbi","USD_symbol":"$","AUD_displayName":"Australian Dollar","JPY_displayName":"Japanese Yen","CAD_symbol":"CA$","USD_displayName":"US Dollar","CNY_symbol":"RMB","GBP_displayName":"British Pound Sterling","GBP_symbol":"£","AUD_symbol":"A$","EUR_displayName":"Euro","EUR_symbol":"€"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en/gregorian.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en/gregorian.js index 34f2335d..2c9b1f3e 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en/gregorian.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en/gregorian.js @@ -1 +1 @@ -({"dateFormat-medium": "MMM d, yyyy", "timeFormat-full": "h:mm:ss a v", "months-standAlone-narrow": ["J", "F", "M", "A", "M", "J", "J", "A", "S", "O", "N", "D"], "eraNames": ["Before Christ", "Anno Domini"], "days-standAlone-narrow": ["S", "M", "T", "W", "T", "F", "S"], "timeFormat-medium": "h:mm:ss a", "dateFormat-long": "MMMM d, yyyy", "field-dayperiod": "AM/PM", "dateFormat-short": "M/d/yy", "months-format-wide": ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"], "timeFormat-short": "h:mm a", "months-format-abbr": ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"], "days-format-wide": ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"], "timeFormat-long": "h:mm:ss a z", "eraAbbr": ["BC", "AD"], "quarters-format-wide": ["1st quarter", "2nd quarter", "3rd quarter", "4th quarter"], "dateFormat-full": "EEEE, MMMM d, yyyy", "days-format-abbr": ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"], "dateTimeFormats-appendItem-Second": "{0} ({2}: {1})", "field-minute": "Minute", "field-weekday": "Day of the Week", "dateTimeFormats-appendItem-Year": "{0} {1}", "field-era": "Era", "field-hour": "Hour", "dateTimeFormats-appendItem-Week": "{0} ({2}: {1})", "dateTimeFormats-appendItem-Timezone": "{0} {1}", "dateTimeFormats-appendItem-Month": "{0} ({2}: {1})", "field-zone": "Zone", "dateTimeFormats-appendItem-Minute": "{0} ({2}: {1})", "quarters-format-abbreviated": ["Q1", "Q2", "Q3", "Q4"], "dateTimeFormat": "{1} {0}", "field-year": "Year", "dateTimeFormats-appendItem-Day": "{0} ({2}: {1})", "field-week": "Week", "field-month": "Month", "dateTimeFormats-appendItem-Quarter": "{0} ({2}: {1})", "pm": "PM", "field-second": "Second", "field-day": "Day", "dateTimeFormats-appendItem-Day-Of-Week": "{0} {1}", "dateTimeFormats-appendItem-Hour": "{0} ({2}: {1})", "am": "AM", "dateTimeFormats-appendItem-Era": "{0} {1}"}) \ No newline at end of file +({"field-dayperiod":"AM/PM","field-minute":"Minute","eraNames":["Before Christ","Anno Domini"],"field-weekday":"Day of the Week","days-standAlone-wide":["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],"months-standAlone-narrow":["J","F","M","A","M","J","J","A","S","O","N","D"],"field-era":"Era","field-hour":"Hour","timeFormat-full":"h:mm:ss a v","months-standAlone-abbr":["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],"days-standAlone-narrow":["S","M","T","W","T","F","S"],"eraAbbr":["BC","AD"],"dateFormat-long":"MMMM d, yyyy","timeFormat-medium":"h:mm:ss a","field-zone":"Zone","dateFormat-medium":"MMM d, yyyy","quarters-standAlone-wide":["1st quarter","2nd quarter","3rd quarter","4th quarter"],"dateTimeFormat":"{1} {0}","field-year":"Year","quarters-standAlone-narrow":["1","2","3","4"],"months-standAlone-wide":["January","February","March","April","May","June","July","August","September","October","November","December"],"field-week":"Week","timeFormat-long":"h:mm:ss a z","months-format-abbr":["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],"timeFormat-short":"h:mm a","field-month":"Month","quarters-format-abbr":["Q1","Q2","Q3","Q4"],"days-format-abbr":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],"pm":"p.m.","days-format-narrow":["S","M","T","W","T","F","S"],"field-second":"Second","field-day":"Day","months-format-narrow":["J","F","M","A","M","J","J","A","S","O","N","D"],"am":"a.m.","days-standAlone-abbr":["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],"dateFormat-short":"M/d/yy","dateFormat-full":"EEEE, MMMM d, yyyy","months-format-wide":["January","February","March","April","May","June","July","August","September","October","November","December"],"dateTimeAvailableFormats":["HH:mm","HH:mm:ss","L","E, M/d","LLL","E, MMM d","E, MMMM d","MMMM d","MMM d","M/d","d","h:mm a","mm:ss","yyyy","M/yyyy","EEE, M/d/yyyy","MMM yyyy","EEE, MMM d, yyyy","MMMM yyyy","Q yyyy","QQQ yyyy"],"quarters-format-wide":["1st quarter","2nd quarter","3rd quarter","4th quarter"],"days-format-wide":["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],"eraNarrow":["B","A"],"dateTimeFormats-appendItem-Second":"{0} ({2}: {1})","dateTimeFormats-appendItem-Year":"{0} {1}","quarters-standAlone-abbr":["Q1","Q2","Q3","Q4"],"dateTimeFormats-appendItem-Week":"{0} ({2}: {1})","dateTimeFormats-appendItem-Timezone":"{0} {1}","dateTimeFormats-appendItem-Month":"{0} ({2}: {1})","dateTimeFormats-appendItem-Minute":"{0} ({2}: {1})","dateTimeFormats-appendItem-Day":"{0} ({2}: {1})","quarters-format-narrow":["1","2","3","4"],"dateTimeFormats-appendItem-Quarter":"{0} ({2}: {1})","dateTimeFormats-appendItem-Day-Of-Week":"{0} {1}","dateTimeFormats-appendItem-Hour":"{0} ({2}: {1})","dateTimeFormats-appendItem-Era":"{0} {1}"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en/number.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en/number.js index 517085a8..92b2e32b 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en/number.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/en/number.js @@ -1 +1 @@ -({"currencyFormat": "¤#,##0.00", "scientificFormat": "#E0", "currencySpacing-afterCurrency-currencyMatch": "[:letter:]", "infinity": "∞", "list": ";", "percentSign": "%", "minusSign": "-", "currencySpacing-beforeCurrency-surroundingMatch": "[:digit:]", "currencySpacing-afterCurrency-insertBetween": " ", "nan": "NaN", "nativeZeroDigit": "0", "plusSign": "+", "currencySpacing-afterCurrency-surroundingMatch": "[:digit:]", "currencySpacing-beforeCurrency-currencyMatch": "[:letter:]", "perMille": "‰", "group": ",", "percentFormat": "#,##0%", "decimalFormat": "#,##0.###", "decimal": ".", "patternDigit": "#", "currencySpacing-beforeCurrency-insertBetween": " ", "exponential": "E"}) \ No newline at end of file +({"group":",","percentSign":"%","exponential":"E","percentFormat":"#,##0%","scientificFormat":"#E0","list":";","infinity":"∞","patternDigit":"#","minusSign":"-","decimal":".","nan":"NaN","nativeZeroDigit":"0","perMille":"‰","decimalFormat":"#,##0.###","currencyFormat":"¤#,##0.00;(¤#,##0.00)","plusSign":"+","currencySpacing-afterCurrency-currencyMatch":"[:letter:]","currencySpacing-beforeCurrency-surroundingMatch":"[:digit:]","currencySpacing-afterCurrency-insertBetween":" ","currencySpacing-afterCurrency-surroundingMatch":"[:digit:]","currencySpacing-beforeCurrency-currencyMatch":"[:letter:]","currencySpacing-beforeCurrency-insertBetween":" "}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/es-es/gregorian.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/es-es/gregorian.js index 36e2a528..18c9d227 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/es-es/gregorian.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/es-es/gregorian.js @@ -1 +1 @@ -({"dateFormat-short": "dd/MM/yy", "dateFormat-medium": "dd/MM/yyyy", "timeFormat-medium": "H:mm:ss", "timeFormat-short": "H:mm", "quarters-format-abbreviated": ["T1", "T2", "T3", "T4"], "field-second": "segundo", "field-week": "semana", "pm": "p.m.", "timeFormat-full": "HH'H'mm''ss\" z", "months-standAlone-narrow": ["E", "F", "M", "A", "M", "J", "J", "A", "S", "O", "N", "D"], "am": "a.m.", "days-standAlone-narrow": ["D", "L", "M", "M", "J", "V", "S"], "field-year": "año", "field-minute": "minuto", "field-hour": "hora", "dateFormat-long": "d' de 'MMMM' de 'yyyy", "field-day": "día", "field-dayperiod": "periodo del día", "field-month": "mes", "months-format-wide": ["enero", "febrero", "marzo", "abril", "mayo", "junio", "julio", "agosto", "septiembre", "octubre", "noviembre", "diciembre"], "field-era": "era", "months-format-abbr": ["ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sep", "oct", "nov", "dic"], "days-format-wide": ["domingo", "lunes", "martes", "miércoles", "jueves", "viernes", "sábado"], "eraAbbr": ["a.C.", "d.C."], "quarters-format-wide": ["1er trimestre", "2º trimestre", "3er trimestre", "4º trimestre"], "dateFormat-full": "EEEE d' de 'MMMM' de 'yyyy", "field-weekday": "día de la semana", "days-format-abbr": ["dom", "lun", "mar", "mié", "jue", "vie", "sáb"], "field-zone": "zona", "dateTimeFormats-appendItem-Second": "{0} ({2}: {1})", "eraNames": ["BCE", "CE"], "dateTimeFormats-appendItem-Year": "{0} {1}", "dateTimeFormats-appendItem-Week": "{0} ({2}: {1})", "dateTimeFormats-appendItem-Timezone": "{0} {1}", "dateTimeFormats-appendItem-Month": "{0} ({2}: {1})", "dateTimeFormats-appendItem-Minute": "{0} ({2}: {1})", "dateTimeFormat": "{1} {0}", "dateTimeFormats-appendItem-Day": "{0} ({2}: {1})", "timeFormat-long": "HH:mm:ss z", "dateTimeFormats-appendItem-Quarter": "{0} ({2}: {1})", "dateTimeFormats-appendItem-Day-Of-Week": "{0} {1}", "dateTimeFormats-appendItem-Hour": "{0} ({2}: {1})", "dateTimeFormats-appendItem-Era": "{0} {1}"}) \ No newline at end of file +({"timeFormat-medium":"H:mm:ss","timeFormat-full":"HH'H'mm''ss\" v","timeFormat-short":"H:mm","field-dayperiod":"periodo del día","field-minute":"minuto","eraNames":["antes de Cristo","anno Dómini"],"field-weekday":"día de la semana","days-standAlone-wide":["domingo","lunes","martes","miércoles","jueves","viernes","sábado"],"months-standAlone-narrow":["E","F","M","A","M","J","J","A","S","O","N","D"],"field-era":"era","field-hour":"hora","quarters-standAlone-abbr":["T1","T2","T3","T4"],"months-standAlone-abbr":["ene","feb","mar","abr","may","jun","jul","ago","sep","oct","nov","dic"],"days-standAlone-narrow":["D","L","M","M","J","V","S"],"eraAbbr":["a.C.","d.C."],"dateFormat-long":"d 'de' MMMM 'de' yyyy","field-zone":"zona","dateFormat-medium":"dd/MM/yyyy","quarters-standAlone-wide":["1er trimestre","2º trimestre","3er trimestre","4º trimestre"],"dateTimeFormat":"{1} {0}","field-year":"año","quarters-standAlone-narrow":["1","2","3","4"],"months-standAlone-wide":["enero","febrero","marzo","abril","mayo","junio","julio","agosto","septiembre","octubre","noviembre","diciembre"],"field-week":"semana","timeFormat-long":"HH:mm:ss z","months-format-abbr":["ene","feb","mar","abr","may","jun","jul","ago","sep","oct","nov","dic"],"field-month":"mes","quarters-format-abbr":["T1","T2","T3","T4"],"days-format-abbr":["dom","lun","mar","mié","jue","vie","sáb"],"pm":"p.m.","days-format-narrow":["D","L","M","M","J","V","S"],"field-second":"segundo","field-day":"día","months-format-narrow":["E","F","M","A","M","J","J","A","S","O","N","D"],"am":"a.m.","days-standAlone-abbr":["dom","lun","mar","mié","jue","vie","sáb"],"dateFormat-short":"dd/MM/yy","dateFormat-full":"EEEE d 'de' MMMM 'de' yyyy","months-format-wide":["enero","febrero","marzo","abril","mayo","junio","julio","agosto","septiembre","octubre","noviembre","diciembre"],"dateTimeAvailableFormats":["HH:mm","HH:mm:ss","H:mm","L","E, d-M","LLL","E d MMM","E d MMMM","d 'de' MMMM","d MMM","dd-MMM","d/MM","d/M","d","hh:mm a","hh:mm:ss a","mm:ss","mm:ss","yyyy","M/yyyy","EEE d/M/yyyy","MMM yyyy","EEE, d MMM yyyy","MMMM 'de' yyyy","Q yyyy","QQQ yyyy","MM/yy","MMM-yy","Q yy","QQQQ 'de' yy","MM/yyyy"],"quarters-format-wide":["1er trimestre","2º trimestre","3er trimestre","4º trimestre"],"days-format-wide":["domingo","lunes","martes","miércoles","jueves","viernes","sábado"],"eraNarrow":["a.C.","d.C."],"dateTimeFormats-appendItem-Second":"{0} ({2}: {1})","dateTimeFormats-appendItem-Year":"{0} {1}","dateTimeFormats-appendItem-Week":"{0} ({2}: {1})","dateTimeFormats-appendItem-Timezone":"{0} {1}","dateTimeFormats-appendItem-Month":"{0} ({2}: {1})","dateTimeFormats-appendItem-Minute":"{0} ({2}: {1})","dateTimeFormats-appendItem-Day":"{0} ({2}: {1})","quarters-format-narrow":["1","2","3","4"],"dateTimeFormats-appendItem-Quarter":"{0} ({2}: {1})","dateTimeFormats-appendItem-Day-Of-Week":"{0} {1}","dateTimeFormats-appendItem-Hour":"{0} ({2}: {1})","dateTimeFormats-appendItem-Era":"{0} {1}"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/es-es/number.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/es-es/number.js index 8ab06ccb..70e001fd 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/es-es/number.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/es-es/number.js @@ -1 +1 @@ -({"currencyFormat": "#,##0.00 ¤", "group": ".", "decimal": ",", "scientificFormat": "#E0", "currencySpacing-afterCurrency-currencyMatch": "[:letter:]", "infinity": "∞", "list": ";", "percentSign": "%", "minusSign": "-", "currencySpacing-beforeCurrency-surroundingMatch": "[:digit:]", "currencySpacing-afterCurrency-insertBetween": " ", "nan": "NaN", "nativeZeroDigit": "0", "plusSign": "+", "currencySpacing-afterCurrency-surroundingMatch": "[:digit:]", "currencySpacing-beforeCurrency-currencyMatch": "[:letter:]", "perMille": "‰", "percentFormat": "#,##0%", "decimalFormat": "#,##0.###", "patternDigit": "#", "currencySpacing-beforeCurrency-insertBetween": " ", "exponential": "E"}) \ No newline at end of file +({"currencyFormat":"#,##0.00 ¤","decimalFormat":"#,##0.###","group":".","scientificFormat":"#E0","percentFormat":"#,##0%","decimal":",","currencySpacing-afterCurrency-currencyMatch":"[:letter:]","infinity":"∞","list":";","percentSign":"%","minusSign":"-","currencySpacing-beforeCurrency-surroundingMatch":"[:digit:]","currencySpacing-afterCurrency-insertBetween":" ","nan":"NaN","nativeZeroDigit":"0","plusSign":"+","currencySpacing-afterCurrency-surroundingMatch":"[:digit:]","currencySpacing-beforeCurrency-currencyMatch":"[:letter:]","perMille":"‰","patternDigit":"#","currencySpacing-beforeCurrency-insertBetween":" ","exponential":"E"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/es/currency.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/es/currency.js index 640682a1..40b46616 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/es/currency.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/es/currency.js @@ -1 +1 @@ -({"HKD_displayName": "dólar de Hong Kong", "CHF_displayName": "franco suizo", "CHF_symbol": "SwF", "HKD_symbol": "HK$", "CAD_displayName": "dólar canadiense", "USD_symbol": "US$", "AUD_displayName": "dólar australiano", "JPY_displayName": "yen japonés", "CAD_symbol": "Can$", "USD_displayName": "dólar estadounidense", "GBP_displayName": "libra esterlina británica", "AUD_symbol": "$A", "EUR_displayName": "euro", "GBP_symbol": "£", "JPY_symbol": "¥", "EUR_symbol": "€"}) \ No newline at end of file +({"HKD_displayName":"dólar de Hong Kong","CHF_displayName":"franco suizo","CHF_symbol":"SwF","HKD_symbol":"HK$","CAD_displayName":"dólar canadiense","CNY_displayName":"yuan renminbi chino","AUD_displayName":"dólar australiano","JPY_displayName":"yen japonés","CAD_symbol":"Can$","USD_displayName":"dólar estadounidense","CNY_symbol":"Y","GBP_displayName":"libra esterlina británica","AUD_symbol":"$A","EUR_displayName":"euro","USD_symbol":"US$","GBP_symbol":"UK£","JPY_symbol":"JP¥","EUR_symbol":"€"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/es/gregorian.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/es/gregorian.js index ac5596f2..36c14c38 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/es/gregorian.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/es/gregorian.js @@ -1 +1 @@ -({"quarters-format-abbreviated": ["T1", "T2", "T3", "T4"], "dateFormat-medium": "dd-MMM-yy", "field-second": "segundo", "field-week": "semana", "pm": "p.m.", "timeFormat-full": "HH'H'mm''ss\" z", "months-standAlone-narrow": ["E", "F", "M", "A", "M", "J", "J", "A", "S", "O", "N", "D"], "am": "a.m.", "days-standAlone-narrow": ["D", "L", "M", "M", "J", "V", "S"], "field-year": "año", "field-minute": "minuto", "field-hour": "hora", "dateFormat-long": "d' de 'MMMM' de 'yyyy", "field-day": "día", "field-dayperiod": "periodo del día", "field-month": "mes", "dateFormat-short": "d/MM/yy", "months-format-wide": ["enero", "febrero", "marzo", "abril", "mayo", "junio", "julio", "agosto", "septiembre", "octubre", "noviembre", "diciembre"], "field-era": "era", "months-format-abbr": ["ene", "feb", "mar", "abr", "may", "jun", "jul", "ago", "sep", "oct", "nov", "dic"], "days-format-wide": ["domingo", "lunes", "martes", "miércoles", "jueves", "viernes", "sábado"], "eraAbbr": ["a.C.", "d.C."], "quarters-format-wide": ["1er trimestre", "2º trimestre", "3er trimestre", "4º trimestre"], "dateFormat-full": "EEEE d' de 'MMMM' de 'yyyy", "field-weekday": "día de la semana", "days-format-abbr": ["dom", "lun", "mar", "mié", "jue", "vie", "sáb"], "field-zone": "zona", "dateTimeFormats-appendItem-Second": "{0} ({2}: {1})", "eraNames": ["BCE", "CE"], "dateTimeFormats-appendItem-Year": "{0} {1}", "dateTimeFormats-appendItem-Week": "{0} ({2}: {1})", "dateTimeFormats-appendItem-Timezone": "{0} {1}", "dateTimeFormats-appendItem-Month": "{0} ({2}: {1})", "timeFormat-medium": "HH:mm:ss", "dateTimeFormats-appendItem-Minute": "{0} ({2}: {1})", "dateTimeFormat": "{1} {0}", "dateTimeFormats-appendItem-Day": "{0} ({2}: {1})", "timeFormat-long": "HH:mm:ss z", "timeFormat-short": "HH:mm", "dateTimeFormats-appendItem-Quarter": "{0} ({2}: {1})", "dateTimeFormats-appendItem-Day-Of-Week": "{0} {1}", "dateTimeFormats-appendItem-Hour": "{0} ({2}: {1})", "dateTimeFormats-appendItem-Era": "{0} {1}"}) \ No newline at end of file +({"field-dayperiod":"periodo del día","field-minute":"minuto","eraNames":["antes de Cristo","anno Dómini"],"field-weekday":"día de la semana","days-standAlone-wide":["domingo","lunes","martes","miércoles","jueves","viernes","sábado"],"months-standAlone-narrow":["E","F","M","A","M","J","J","A","S","O","N","D"],"field-era":"era","field-hour":"hora","quarters-standAlone-abbr":["T1","T2","T3","T4"],"timeFormat-full":"hh:mm:ss a v","months-standAlone-abbr":["ene","feb","mar","abr","may","jun","jul","ago","sep","oct","nov","dic"],"days-standAlone-narrow":["D","L","M","M","J","V","S"],"eraAbbr":["a.C.","d.C."],"dateFormat-long":"d 'de' MMMM 'de' yyyy","timeFormat-medium":"HH:mm:ss","field-zone":"zona","dateFormat-medium":"dd/MM/yyyy","quarters-standAlone-wide":["1er trimestre","2º trimestre","3er trimestre","4º trimestre"],"dateTimeFormat":"{1} {0}","field-year":"año","quarters-standAlone-narrow":["1","2","3","4"],"months-standAlone-wide":["enero","febrero","marzo","abril","mayo","junio","julio","agosto","septiembre","octubre","noviembre","diciembre"],"field-week":"semana","timeFormat-long":"HH:mm:ss z","months-format-abbr":["ene","feb","mar","abr","may","jun","jul","ago","sep","oct","nov","dic"],"timeFormat-short":"HH:mm","field-month":"mes","quarters-format-abbr":["T1","T2","T3","T4"],"days-format-abbr":["dom","lun","mar","mié","jue","vie","sáb"],"pm":"p.m.","days-format-narrow":["D","L","M","M","J","V","S"],"field-second":"segundo","field-day":"día","months-format-narrow":["E","F","M","A","M","J","J","A","S","O","N","D"],"am":"a.m.","days-standAlone-abbr":["dom","lun","mar","mié","jue","vie","sáb"],"dateFormat-short":"dd/MM/yy","dateFormat-full":"EEEE d 'de' MMMM 'de' yyyy","months-format-wide":["enero","febrero","marzo","abril","mayo","junio","julio","agosto","septiembre","octubre","noviembre","diciembre"],"dateTimeAvailableFormats":["HH:mm","HH:mm:ss","H:mm","L","E, d-M","LLL","E d MMM","E d MMMM","d 'de' MMMM","d MMM","dd-MMM","d/MM","d/M","d","hh:mm a","hh:mm:ss a","mm:ss","mm:ss","yyyy","M/yyyy","EEE d/M/yyyy","MMM yyyy","EEE, d MMM yyyy","MMMM 'de' yyyy","Q yyyy","QQQ yyyy","MM/yy","MMM-yy","Q yy","QQQQ 'de' yy","MM/yyyy"],"quarters-format-wide":["1er trimestre","2º trimestre","3er trimestre","4º trimestre"],"days-format-wide":["domingo","lunes","martes","miércoles","jueves","viernes","sábado"],"eraNarrow":["a.C.","d.C."],"dateTimeFormats-appendItem-Second":"{0} ({2}: {1})","dateTimeFormats-appendItem-Year":"{0} {1}","dateTimeFormats-appendItem-Week":"{0} ({2}: {1})","dateTimeFormats-appendItem-Timezone":"{0} {1}","dateTimeFormats-appendItem-Month":"{0} ({2}: {1})","dateTimeFormats-appendItem-Minute":"{0} ({2}: {1})","dateTimeFormats-appendItem-Day":"{0} ({2}: {1})","quarters-format-narrow":["1","2","3","4"],"dateTimeFormats-appendItem-Quarter":"{0} ({2}: {1})","dateTimeFormats-appendItem-Day-Of-Week":"{0} {1}","dateTimeFormats-appendItem-Hour":"{0} ({2}: {1})","dateTimeFormats-appendItem-Era":"{0} {1}"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/es/number.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/es/number.js index 5fbb7ba7..d878fb38 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/es/number.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/es/number.js @@ -1 +1 @@ -({"currencyFormat": "¤#,##0.00;(¤#,##0.00)", "group": ".", "decimal": ",", "scientificFormat": "#E0", "currencySpacing-afterCurrency-currencyMatch": "[:letter:]", "infinity": "∞", "list": ";", "percentSign": "%", "minusSign": "-", "currencySpacing-beforeCurrency-surroundingMatch": "[:digit:]", "currencySpacing-afterCurrency-insertBetween": " ", "nan": "NaN", "nativeZeroDigit": "0", "plusSign": "+", "currencySpacing-afterCurrency-surroundingMatch": "[:digit:]", "currencySpacing-beforeCurrency-currencyMatch": "[:letter:]", "perMille": "‰", "percentFormat": "#,##0%", "decimalFormat": "#,##0.###", "patternDigit": "#", "currencySpacing-beforeCurrency-insertBetween": " ", "exponential": "E"}) \ No newline at end of file +({"decimalFormat":"#,##0.###","group":".","scientificFormat":"#E0","percentFormat":"#,##0%","currencyFormat":"¤ #,##0.00","decimal":",","currencySpacing-afterCurrency-currencyMatch":"[:letter:]","infinity":"∞","list":";","percentSign":"%","minusSign":"-","currencySpacing-beforeCurrency-surroundingMatch":"[:digit:]","currencySpacing-afterCurrency-insertBetween":" ","nan":"NaN","nativeZeroDigit":"0","plusSign":"+","currencySpacing-afterCurrency-surroundingMatch":"[:digit:]","currencySpacing-beforeCurrency-currencyMatch":"[:letter:]","perMille":"‰","patternDigit":"#","currencySpacing-beforeCurrency-insertBetween":" ","exponential":"E"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/fr/currency.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/fr/currency.js index 7360e5e6..cb3b6897 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/fr/currency.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/fr/currency.js @@ -1 +1 @@ -({"HKD_displayName": "dollar de Hong Kong", "CHF_displayName": "franc suisse", "CHF_symbol": "sFr.", "CAD_displayName": "dollar canadien", "AUD_displayName": "dollar australien", "JPY_displayName": "yen", "USD_displayName": "dollar des États-Unis", "GBP_displayName": "livre sterling", "EUR_displayName": "euro", "USD_symbol": "$", "GBP_symbol": "£", "JPY_symbol": "¥", "EUR_symbol": "€"}) \ No newline at end of file +({"HKD_displayName":"dollar de Hong Kong","CHF_displayName":"franc suisse","CHF_symbol":"sFr.","JPY_symbol":"¥JP","HKD_symbol":"$HK","CAD_displayName":"dollar canadien","CNY_displayName":"yuan renminbi chinois","USD_symbol":"$US","AUD_displayName":"dollar australien","JPY_displayName":"yen japonais","CAD_symbol":"$Ca","USD_displayName":"dollar des États-Unis","CNY_symbol":"Ұ","GBP_displayName":"livre sterling","GBP_symbol":"£UK","AUD_symbol":"$A","EUR_displayName":"euro","EUR_symbol":"€"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/fr/gregorian.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/fr/gregorian.js index 7ccea622..039be7ea 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/fr/gregorian.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/fr/gregorian.js @@ -1 +1 @@ -({"eraNames": ["av. J.-C.", "ap. J.-C."], "timeFormat-full": "HH' h 'mm z", "eraAbbr": ["av. J.-C.", "apr. J.-C."], "dateFormat-medium": "d MMM yy", "months-format-abbr": ["janv.", "févr.", "mars", "avr.", "mai", "juin", "juil.", "août", "sept.", "oct.", "nov.", "déc."], "dateFormat-full": "EEEE d MMMM yyyy", "days-format-abbr": ["dim.", "lun.", "mar.", "mer.", "jeu.", "ven.", "sam."], "quarters-format-wide": ["1er trimestre", "2e trimestre", "3e trimestre", "4e trimestre"], "dateFormat-short": "dd/MM/yy", "quarters-format-abbreviated": ["T1", "T2", "T3", "T4"], "months-format-wide": ["janvier", "février", "mars", "avril", "mai", "juin", "juillet", "août", "septembre", "octobre", "novembre", "décembre"], "months-standAlone-narrow": ["J", "F", "M", "A", "M", "J", "J", "A", "S", "O", "N", "D"], "days-standAlone-narrow": ["D", "L", "M", "M", "J", "V", "S"], "dateFormat-long": "d MMMM yyyy", "days-format-wide": ["dimanche", "lundi", "mardi", "mercredi", "jeudi", "vendredi", "samedi"], "dateTimeFormats-appendItem-Second": "{0} ({2}: {1})", "field-dayperiod": "Dayperiod", "field-minute": "Minute", "field-weekday": "Day of the Week", "dateTimeFormats-appendItem-Year": "{0} {1}", "field-era": "Era", "field-hour": "Hour", "dateTimeFormats-appendItem-Week": "{0} ({2}: {1})", "dateTimeFormats-appendItem-Timezone": "{0} {1}", "dateTimeFormats-appendItem-Month": "{0} ({2}: {1})", "timeFormat-medium": "HH:mm:ss", "field-zone": "Zone", "dateTimeFormats-appendItem-Minute": "{0} ({2}: {1})", "dateTimeFormat": "{1} {0}", "field-year": "Year", "dateTimeFormats-appendItem-Day": "{0} ({2}: {1})", "field-week": "Week", "timeFormat-long": "HH:mm:ss z", "timeFormat-short": "HH:mm", "field-month": "Month", "dateTimeFormats-appendItem-Quarter": "{0} ({2}: {1})", "pm": "PM", "field-second": "Second", "field-day": "Day", "dateTimeFormats-appendItem-Day-Of-Week": "{0} {1}", "dateTimeFormats-appendItem-Hour": "{0} ({2}: {1})", "am": "AM", "dateTimeFormats-appendItem-Era": "{0} {1}"}) \ No newline at end of file +({"field-dayperiod":"cadran","field-minute":"minute","eraNames":["avant Jésus-Christ","après Jésus-Christ"],"field-weekday":"jour de la semaine","days-standAlone-wide":["dimanche","lundi","mardi","mercredi","jeudi","vendredi","samedi"],"months-standAlone-narrow":["J","F","M","A","M","J","J","A","S","O","N","D"],"field-era":"ère","field-hour":"heure","quarters-standAlone-abbr":["T1","T2","T3","T4"],"timeFormat-full":"HH:mm:ss v","months-standAlone-abbr":["janv.","févr.","mars","avr.","mai","juin","juil.","août","sept.","oct.","nov.","déc."],"days-standAlone-narrow":["D","L","M","M","J","V","S"],"eraAbbr":["av. J.-C.","ap. J.-C."],"dateFormat-long":"d MMMM yyyy","timeFormat-medium":"HH:mm:ss","field-zone":"fuseau horaire","dateFormat-medium":"d MMM yyyy","quarters-standAlone-wide":["1er trimestre","2e trimestre","3e trimestre","4e trimestre"],"dateTimeFormat":"{1} {0}","field-year":"année","quarters-standAlone-narrow":["1","2","3","4"],"months-standAlone-wide":["janvier","février","mars","avril","mai","juin","juillet","août","septembre","octobre","novembre","décembre"],"field-week":"semaine","timeFormat-long":"HH:mm:ss z","months-format-abbr":["janv.","févr.","mars","avr.","mai","juin","juil.","août","sept.","oct.","nov.","déc."],"timeFormat-short":"HH:mm","field-month":"mois","quarters-format-abbr":["T1","T2","T3","T4"],"days-format-abbr":["dim.","lun.","mar.","mer.","jeu.","ven.","sam."],"pm":"PM","days-format-narrow":["D","L","M","M","J","V","S"],"field-second":"seconde","field-day":"jour","months-format-narrow":["J","F","M","A","M","J","J","A","S","O","N","D"],"am":"AM","days-standAlone-abbr":["dim.","lun.","mar.","mer.","jeu.","ven.","sam."],"dateFormat-short":"dd/MM/yy","dateFormat-full":"EEEE d MMMM yyyy","months-format-wide":["janvier","février","mars","avril","mai","juin","juillet","août","septembre","octobre","novembre","décembre"],"dateTimeAvailableFormats":["HH:mm","HH:mm:ss","H:mm","L","EEE d/M","LLL","E d MMM","EEE d MMMM","d MMMM","d MMM","dd MMM","d/MM","dd/MM","d/M","d","HH:mm","HH:mm:ss","mm:ss","mm:ss","yyyy","M/yyyy","EEE d/M/yyyy","MMM yyyy","EEE d MMM yyyy","MMMM yyyy","'T'Q yyyy","QQQ yyyy","MM/yy","MMM yy","EEE d MMM yy","d MMM yy","'T'Q yy","QQQQ yy","MMMM yyyy"],"quarters-format-wide":["1er trimestre","2e trimestre","3e trimestre","4e trimestre"],"days-format-wide":["dimanche","lundi","mardi","mercredi","jeudi","vendredi","samedi"],"eraNarrow":["av. J.-C.","ap. J.-C."],"dateTimeFormats-appendItem-Second":"{0} ({2}: {1})","dateTimeFormats-appendItem-Year":"{0} {1}","dateTimeFormats-appendItem-Week":"{0} ({2}: {1})","dateTimeFormats-appendItem-Timezone":"{0} {1}","dateTimeFormats-appendItem-Month":"{0} ({2}: {1})","dateTimeFormats-appendItem-Minute":"{0} ({2}: {1})","dateTimeFormats-appendItem-Day":"{0} ({2}: {1})","quarters-format-narrow":["1","2","3","4"],"dateTimeFormats-appendItem-Quarter":"{0} ({2}: {1})","dateTimeFormats-appendItem-Day-Of-Week":"{0} {1}","dateTimeFormats-appendItem-Hour":"{0} ({2}: {1})","dateTimeFormats-appendItem-Era":"{0} {1}"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/fr/number.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/fr/number.js index beb3be85..f9a71abd 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/fr/number.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/fr/number.js @@ -1 +1 @@ -({"group": " ", "percentFormat": "#,##0 %", "currencyFormat": "#,##0.00 ¤", "decimal": ",", "scientificFormat": "#E0", "currencySpacing-afterCurrency-currencyMatch": "[:letter:]", "infinity": "∞", "list": ";", "percentSign": "%", "minusSign": "-", "currencySpacing-beforeCurrency-surroundingMatch": "[:digit:]", "currencySpacing-afterCurrency-insertBetween": " ", "nan": "NaN", "nativeZeroDigit": "0", "plusSign": "+", "currencySpacing-afterCurrency-surroundingMatch": "[:digit:]", "currencySpacing-beforeCurrency-currencyMatch": "[:letter:]", "perMille": "‰", "decimalFormat": "#,##0.###", "patternDigit": "#", "currencySpacing-beforeCurrency-insertBetween": " ", "exponential": "E"}) \ No newline at end of file +({"group":" ","percentSign":"%","exponential":"E","percentFormat":"#,##0 %","scientificFormat":"#E0","list":";","infinity":"∞","patternDigit":"#","minusSign":"-","decimal":",","nan":"NaN","nativeZeroDigit":"0","perMille":"‰","decimalFormat":"#,##0.###","currencyFormat":"#,##0.00 ¤","plusSign":"+","currencySpacing-afterCurrency-currencyMatch":"[:letter:]","currencySpacing-beforeCurrency-surroundingMatch":"[:digit:]","currencySpacing-afterCurrency-insertBetween":" ","currencySpacing-afterCurrency-surroundingMatch":"[:digit:]","currencySpacing-beforeCurrency-currencyMatch":"[:letter:]","currencySpacing-beforeCurrency-insertBetween":" "}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/gregorian.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/gregorian.js index 80deb5c7..c13511eb 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/gregorian.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/gregorian.js @@ -1 +1 @@ -({"dateTimeFormats-appendItem-Second": "{0} ({2}: {1})", "field-dayperiod": "Dayperiod", "field-minute": "Minute", "eraNames": ["BCE", "CE"], "field-weekday": "Day of the Week", "months-standAlone-narrow": ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"], "dateTimeFormats-appendItem-Year": "{0} {1}", "field-era": "Era", "field-hour": "Hour", "timeFormat-full": "HH:mm:ss z", "dateTimeFormats-appendItem-Week": "{0} ({2}: {1})", "dateTimeFormats-appendItem-Timezone": "{0} {1}", "dateTimeFormats-appendItem-Month": "{0} ({2}: {1})", "days-standAlone-narrow": ["1", "2", "3", "4", "5", "6", "7"], "eraAbbr": ["BCE", "CE"], "dateFormat-long": "yyyy MMMM d", "timeFormat-medium": "HH:mm:ss", "field-zone": "Zone", "dateTimeFormats-appendItem-Minute": "{0} ({2}: {1})", "dateFormat-medium": "yyyy MMM d", "quarters-format-abbreviated": ["Q1", "Q2", "Q3", "Q4"], "dateTimeFormat": "{1} {0}", "field-year": "Year", "dateTimeFormats-appendItem-Day": "{0} ({2}: {1})", "field-week": "Week", "timeFormat-long": "HH:mm:ss z", "months-format-abbr": ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"], "timeFormat-short": "HH:mm", "field-month": "Month", "dateTimeFormats-appendItem-Quarter": "{0} ({2}: {1})", "days-format-abbr": ["1", "2", "3", "4", "5", "6", "7"], "pm": "PM", "field-second": "Second", "field-day": "Day", "dateTimeFormats-appendItem-Day-Of-Week": "{0} {1}", "dateTimeFormats-appendItem-Hour": "{0} ({2}: {1})", "am": "AM", "dateFormat-short": "yy/MM/dd", "dateFormat-full": "EEEE, yyyy MMMM dd", "months-format-wide": ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"], "dateTimeFormats-appendItem-Era": "{0} {1}", "quarters-format-wide": ["Q1", "Q2", "Q3", "Q4"], "days-format-wide": ["1", "2", "3", "4", "5", "6", "7"]}) \ No newline at end of file +({"dateTimeFormats-appendItem-Second":"{0} ({2}: {1})","field-dayperiod":"Dayperiod","field-minute":"Minute","eraNames":["BCE","CE"],"field-weekday":"Day of the Week","days-standAlone-wide":["1","2","3","4","5","6","7"],"months-standAlone-narrow":["1","2","3","4","5","6","7","8","9","10","11","12"],"dateTimeFormats-appendItem-Year":"{0} {1}","field-era":"Era","field-hour":"Hour","quarters-standAlone-abbr":["Q1","Q2","Q3","Q4"],"timeFormat-full":"HH:mm:ss v","dateTimeFormats-appendItem-Week":"{0} ({2}: {1})","dateTimeFormats-appendItem-Timezone":"{0} {1}","months-standAlone-abbr":["1","2","3","4","5","6","7","8","9","10","11","12"],"dateTimeFormats-appendItem-Month":"{0} ({2}: {1})","days-standAlone-narrow":["1","2","3","4","5","6","7"],"eraAbbr":["BCE","CE"],"dateFormat-long":"yyyy MMMM d","timeFormat-medium":"HH:mm:ss","field-zone":"Zone","dateTimeFormats-appendItem-Minute":"{0} ({2}: {1})","dateFormat-medium":"yyyy MMM d","quarters-standAlone-wide":["Q1","Q2","Q3","Q4"],"dateTimeFormat":"{1} {0}","field-year":"Year","quarters-standAlone-narrow":["1","2","3","4"],"months-standAlone-wide":["1","2","3","4","5","6","7","8","9","10","11","12"],"dateTimeFormats-appendItem-Day":"{0} ({2}: {1})","field-week":"Week","quarters-format-narrow":["1","2","3","4"],"timeFormat-long":"HH:mm:ss z","months-format-abbr":["1","2","3","4","5","6","7","8","9","10","11","12"],"timeFormat-short":"HH:mm","field-month":"Month","dateTimeFormats-appendItem-Quarter":"{0} ({2}: {1})","quarters-format-abbr":["Q1","Q2","Q3","Q4"],"days-format-abbr":["1","2","3","4","5","6","7"],"pm":"PM","days-format-narrow":["1","2","3","4","5","6","7"],"field-second":"Second","field-day":"Day","dateTimeFormats-appendItem-Day-Of-Week":"{0} {1}","months-format-narrow":["1","2","3","4","5","6","7","8","9","10","11","12"],"dateTimeFormats-appendItem-Hour":"{0} ({2}: {1})","am":"AM","days-standAlone-abbr":["1","2","3","4","5","6","7"],"dateFormat-short":"yyyy-MM-dd","dateFormat-full":"EEEE, yyyy MMMM dd","months-format-wide":["1","2","3","4","5","6","7","8","9","10","11","12"],"dateTimeAvailableFormats":["H:mm","L","E, M-d","LLL","E MMM d","E MMMM d","MMMM d","MMM d","M-d","d","mm:ss","yyyy","yyyy-M","EEE, yyyy-M-d","yyyy MMM","EEE, yyyy MMM d","yyyy MMMM","yyyy Q","yyyy QQQ"],"dateTimeFormats-appendItem-Era":"{0} {1}","quarters-format-wide":["Q1","Q2","Q3","Q4"],"eraNarrow":["BCE","CE"],"days-format-wide":["1","2","3","4","5","6","7"]}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/it-it/gregorian.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/it-it/gregorian.js index 3ef53321..14756056 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/it-it/gregorian.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/it-it/gregorian.js @@ -1 +1 @@ -({"timeFormat-long": "H:mm:ss z", "quarters-format-abbreviated": ["T1", "T2", "T3", "T4"], "dateFormat-medium": "dd/MMM/yy", "field-second": "secondo", "field-week": "settimana", "pm": "p.", "months-standAlone-narrow": ["G", "F", "M", "A", "M", "G", "L", "A", "S", "O", "N", "D"], "am": "m.", "days-standAlone-narrow": ["D", "L", "M", "M", "G", "V", "S"], "field-year": "anno", "field-minute": "minuto", "field-hour": "ora", "dateFormat-long": "dd MMMM yyyy", "field-day": "giorno", "field-dayperiod": "periodo del giorno", "field-month": "mese", "dateFormat-short": "dd/MM/yy", "months-format-wide": ["gennaio", "febbraio", "marzo", "aprile", "maggio", "giugno", "luglio", "agosto", "settembre", "ottobre", "novembre", "dicembre"], "field-era": "era", "months-format-abbr": ["gen", "feb", "mar", "apr", "mag", "giu", "lug", "ago", "set", "ott", "nov", "dic"], "days-format-wide": ["domenica", "lunedì", "martedì", "mercoledì", "giovedì", "venerdì", "sabato"], "eraAbbr": ["aC", "dC"], "quarters-format-wide": ["1o trimestre", "2o trimestre", "3o trimestre", "4o trimestre"], "dateFormat-full": "EEEE d MMMM yyyy", "field-weekday": "giorno della settimana", "days-format-abbr": ["dom", "lun", "mar", "mer", "gio", "ven", "sab"], "field-zone": "zona", "dateTimeFormats-appendItem-Second": "{0} ({2}: {1})", "eraNames": ["BCE", "CE"], "dateTimeFormats-appendItem-Year": "{0} {1}", "timeFormat-full": "HH:mm:ss z", "dateTimeFormats-appendItem-Week": "{0} ({2}: {1})", "dateTimeFormats-appendItem-Timezone": "{0} {1}", "dateTimeFormats-appendItem-Month": "{0} ({2}: {1})", "timeFormat-medium": "HH:mm:ss", "dateTimeFormats-appendItem-Minute": "{0} ({2}: {1})", "dateTimeFormat": "{1} {0}", "dateTimeFormats-appendItem-Day": "{0} ({2}: {1})", "timeFormat-short": "HH:mm", "dateTimeFormats-appendItem-Quarter": "{0} ({2}: {1})", "dateTimeFormats-appendItem-Day-Of-Week": "{0} {1}", "dateTimeFormats-appendItem-Hour": "{0} ({2}: {1})", "dateTimeFormats-appendItem-Era": "{0} {1}"}) \ No newline at end of file +({"timeFormat-long":"H:mm:ss z","field-dayperiod":"periodo del giorno","field-minute":"minuto","eraNames":["a.C.","d.C"],"field-weekday":"giorno della settimana","days-standAlone-wide":["Domenica","Lunedì","Martedì","Mercoledì","Giovedì","Venerdì","Sabato"],"months-standAlone-narrow":["G","F","M","A","M","G","L","A","S","O","N","D"],"field-era":"era","field-hour":"ora","quarters-standAlone-abbr":["T1","T2","T3","T4"],"timeFormat-full":"HH.mm.ss v","months-standAlone-abbr":["gen","feb","mar","apr","mag","giu","lug","ago","set","ott","nov","dic"],"days-standAlone-narrow":["D","L","M","M","G","V","S"],"eraAbbr":["aC","dC"],"dateFormat-long":"dd MMMM yyyy","timeFormat-medium":"HH.mm.ss","field-zone":"zona","dateFormat-medium":"dd/MMM/yyyy","quarters-standAlone-wide":["1o trimestre","2o trimestre","3o trimestre","4o trimestre"],"dateTimeFormat":"{1} {0}","field-year":"anno","quarters-standAlone-narrow":["1","2","3","4"],"months-standAlone-wide":["Gennaio","Febbraio","Marzo","Aprile","Maggio","Giugno","Luglio","agosto","settembre","ottobre","novembre","dicembre"],"field-week":"settimana","months-format-abbr":["gen","feb","mar","apr","mag","giu","lug","ago","set","ott","nov","dic"],"timeFormat-short":"HH.mm","field-month":"mese","quarters-format-abbr":["T1","T2","T3","T4"],"days-format-abbr":["dom","lun","mar","mer","gio","ven","sab"],"pm":"p.","days-format-narrow":["D","L","M","M","G","V","S"],"field-second":"secondo","field-day":"giorno","months-format-narrow":["G","F","M","A","M","G","L","A","S","O","N","D"],"am":"m.","days-standAlone-abbr":["dom","lun","mar","mer","gio","ven","sab"],"dateFormat-short":"dd/MM/yy","dateFormat-full":"EEEE d MMMM yyyy","months-format-wide":["gennaio","febbraio","marzo","aprile","maggio","giugno","Luglio","agosto","settembre","ottobre","novembre","dicembre"],"dateTimeAvailableFormats":["HH.mm","HH.mm.ss","HH:mm","L","EEE d/M","LLL","EEE d MMM","EEE d MMMM","d MMMM","dd MMMM","d MMM","dd/MM","d/M","d","hh.mm a","hh.mm.ss a","mm:ss","yyyy","M/yyyy","EEE, d-M-yyyy","MMM yyyy","EEE d MMM yyyy","MMMM yyyy","Q-yyyy","QQQ yyyy","MM/yy","Q yy","QQQQ yy","MMMM yyyy"],"quarters-format-wide":["1o trimestre","2o trimestre","3o trimestre","4o trimestre"],"days-format-wide":["domenica","lunedì","martedì","mercoledì","giovedì","venerdì","sabato"],"eraNarrow":["aC","dC"],"dateTimeFormats-appendItem-Second":"{0} ({2}: {1})","dateTimeFormats-appendItem-Year":"{0} {1}","dateTimeFormats-appendItem-Week":"{0} ({2}: {1})","dateTimeFormats-appendItem-Timezone":"{0} {1}","dateTimeFormats-appendItem-Month":"{0} ({2}: {1})","dateTimeFormats-appendItem-Minute":"{0} ({2}: {1})","dateTimeFormats-appendItem-Day":"{0} ({2}: {1})","quarters-format-narrow":["1","2","3","4"],"dateTimeFormats-appendItem-Quarter":"{0} ({2}: {1})","dateTimeFormats-appendItem-Day-Of-Week":"{0} {1}","dateTimeFormats-appendItem-Hour":"{0} ({2}: {1})","dateTimeFormats-appendItem-Era":"{0} {1}"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/it/currency.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/it/currency.js index 844537fa..375ec675 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/it/currency.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/it/currency.js @@ -1 +1 @@ -({"HKD_displayName": "Dollaro di Hong Kong", "CHF_displayName": "Franco Svizzero", "CHF_symbol": "SFr.", "CAD_displayName": "Dollaro Canadese", "AUD_displayName": "Dollaro Australiano", "JPY_displayName": "Yen Giapponese", "USD_displayName": "Dollaro Statunitense", "GBP_displayName": "Sterlina Inglese", "EUR_displayName": "Euro", "USD_symbol": "$", "GBP_symbol": "£", "JPY_symbol": "¥", "EUR_symbol": "€"}) \ No newline at end of file +({"HKD_displayName":"Dollaro di Hong Kong","CHF_displayName":"Franco Svizzero","CHF_symbol":"SFr.","CAD_displayName":"Dollaro Canadese","CNY_displayName":"Renmimbi Cinese","AUD_displayName":"Dollaro Australiano","JPY_displayName":"Yen Giapponese","USD_displayName":"Dollaro Statunitense","GBP_displayName":"Sterlina Inglese","EUR_displayName":"Euro","USD_symbol":"US$","GBP_symbol":"UK£","JPY_symbol":"JP¥","EUR_symbol":"€"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/it/gregorian.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/it/gregorian.js index 72652365..08e76b04 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/it/gregorian.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/it/gregorian.js @@ -1 +1 @@ -({"quarters-format-abbreviated": ["T1", "T2", "T3", "T4"], "dateFormat-medium": "dd/MMM/yy", "field-second": "secondo", "field-week": "settimana", "pm": "p.", "months-standAlone-narrow": ["G", "F", "M", "A", "M", "G", "L", "A", "S", "O", "N", "D"], "am": "m.", "days-standAlone-narrow": ["D", "L", "M", "M", "G", "V", "S"], "field-year": "anno", "field-minute": "minuto", "field-hour": "ora", "dateFormat-long": "dd MMMM yyyy", "field-day": "giorno", "field-dayperiod": "periodo del giorno", "field-month": "mese", "dateFormat-short": "dd/MM/yy", "months-format-wide": ["gennaio", "febbraio", "marzo", "aprile", "maggio", "giugno", "luglio", "agosto", "settembre", "ottobre", "novembre", "dicembre"], "field-era": "era", "months-format-abbr": ["gen", "feb", "mar", "apr", "mag", "giu", "lug", "ago", "set", "ott", "nov", "dic"], "days-format-wide": ["domenica", "lunedì", "martedì", "mercoledì", "giovedì", "venerdì", "sabato"], "eraAbbr": ["aC", "dC"], "quarters-format-wide": ["1o trimestre", "2o trimestre", "3o trimestre", "4o trimestre"], "dateFormat-full": "EEEE d MMMM yyyy", "field-weekday": "giorno della settimana", "days-format-abbr": ["dom", "lun", "mar", "mer", "gio", "ven", "sab"], "field-zone": "zona", "dateTimeFormats-appendItem-Second": "{0} ({2}: {1})", "eraNames": ["BCE", "CE"], "dateTimeFormats-appendItem-Year": "{0} {1}", "timeFormat-full": "HH:mm:ss z", "dateTimeFormats-appendItem-Week": "{0} ({2}: {1})", "dateTimeFormats-appendItem-Timezone": "{0} {1}", "dateTimeFormats-appendItem-Month": "{0} ({2}: {1})", "timeFormat-medium": "HH:mm:ss", "dateTimeFormats-appendItem-Minute": "{0} ({2}: {1})", "dateTimeFormat": "{1} {0}", "dateTimeFormats-appendItem-Day": "{0} ({2}: {1})", "timeFormat-long": "HH:mm:ss z", "timeFormat-short": "HH:mm", "dateTimeFormats-appendItem-Quarter": "{0} ({2}: {1})", "dateTimeFormats-appendItem-Day-Of-Week": "{0} {1}", "dateTimeFormats-appendItem-Hour": "{0} ({2}: {1})", "dateTimeFormats-appendItem-Era": "{0} {1}"}) \ No newline at end of file +({"field-dayperiod":"periodo del giorno","field-minute":"minuto","eraNames":["a.C.","d.C"],"field-weekday":"giorno della settimana","days-standAlone-wide":["Domenica","Lunedì","Martedì","Mercoledì","Giovedì","Venerdì","Sabato"],"months-standAlone-narrow":["G","F","M","A","M","G","L","A","S","O","N","D"],"field-era":"era","field-hour":"ora","quarters-standAlone-abbr":["T1","T2","T3","T4"],"timeFormat-full":"HH.mm.ss v","months-standAlone-abbr":["gen","feb","mar","apr","mag","giu","lug","ago","set","ott","nov","dic"],"days-standAlone-narrow":["D","L","M","M","G","V","S"],"eraAbbr":["aC","dC"],"dateFormat-long":"dd MMMM yyyy","timeFormat-medium":"HH.mm.ss","field-zone":"zona","dateFormat-medium":"dd/MMM/yyyy","quarters-standAlone-wide":["1o trimestre","2o trimestre","3o trimestre","4o trimestre"],"dateTimeFormat":"{1} {0}","field-year":"anno","quarters-standAlone-narrow":["1","2","3","4"],"months-standAlone-wide":["Gennaio","Febbraio","Marzo","Aprile","Maggio","Giugno","Luglio","agosto","settembre","ottobre","novembre","dicembre"],"field-week":"settimana","timeFormat-long":"HH.mm.ss z","months-format-abbr":["gen","feb","mar","apr","mag","giu","lug","ago","set","ott","nov","dic"],"timeFormat-short":"HH.mm","field-month":"mese","quarters-format-abbr":["T1","T2","T3","T4"],"days-format-abbr":["dom","lun","mar","mer","gio","ven","sab"],"pm":"p.","days-format-narrow":["D","L","M","M","G","V","S"],"field-second":"secondo","field-day":"giorno","months-format-narrow":["G","F","M","A","M","G","L","A","S","O","N","D"],"am":"m.","days-standAlone-abbr":["dom","lun","mar","mer","gio","ven","sab"],"dateFormat-short":"dd/MM/yy","dateFormat-full":"EEEE d MMMM yyyy","months-format-wide":["gennaio","febbraio","marzo","aprile","maggio","giugno","Luglio","agosto","settembre","ottobre","novembre","dicembre"],"dateTimeAvailableFormats":["HH.mm","HH.mm.ss","HH:mm","L","EEE d/M","LLL","EEE d MMM","EEE d MMMM","d MMMM","dd MMMM","d MMM","dd/MM","d/M","d","hh.mm a","hh.mm.ss a","mm:ss","yyyy","M/yyyy","EEE, d-M-yyyy","MMM yyyy","EEE d MMM yyyy","MMMM yyyy","Q-yyyy","QQQ yyyy","MM/yy","Q yy","QQQQ yy","MMMM yyyy"],"quarters-format-wide":["1o trimestre","2o trimestre","3o trimestre","4o trimestre"],"days-format-wide":["domenica","lunedì","martedì","mercoledì","giovedì","venerdì","sabato"],"eraNarrow":["aC","dC"],"dateTimeFormats-appendItem-Second":"{0} ({2}: {1})","dateTimeFormats-appendItem-Year":"{0} {1}","dateTimeFormats-appendItem-Week":"{0} ({2}: {1})","dateTimeFormats-appendItem-Timezone":"{0} {1}","dateTimeFormats-appendItem-Month":"{0} ({2}: {1})","dateTimeFormats-appendItem-Minute":"{0} ({2}: {1})","dateTimeFormats-appendItem-Day":"{0} ({2}: {1})","quarters-format-narrow":["1","2","3","4"],"dateTimeFormats-appendItem-Quarter":"{0} ({2}: {1})","dateTimeFormats-appendItem-Day-Of-Week":"{0} {1}","dateTimeFormats-appendItem-Hour":"{0} ({2}: {1})","dateTimeFormats-appendItem-Era":"{0} {1}"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/it/number.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/it/number.js index 0de8f27d..d878fb38 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/it/number.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/it/number.js @@ -1 +1 @@ -({"group": ".", "decimal": ",", "scientificFormat": "#E0", "currencySpacing-afterCurrency-currencyMatch": "[:letter:]", "infinity": "∞", "list": ";", "percentSign": "%", "minusSign": "-", "currencySpacing-beforeCurrency-surroundingMatch": "[:digit:]", "currencySpacing-afterCurrency-insertBetween": " ", "nan": "NaN", "nativeZeroDigit": "0", "plusSign": "+", "currencySpacing-afterCurrency-surroundingMatch": "[:digit:]", "currencyFormat": "¤ #,##0.00", "currencySpacing-beforeCurrency-currencyMatch": "[:letter:]", "perMille": "‰", "percentFormat": "#,##0%", "decimalFormat": "#,##0.###", "patternDigit": "#", "currencySpacing-beforeCurrency-insertBetween": " ", "exponential": "E"}) \ No newline at end of file +({"decimalFormat":"#,##0.###","group":".","scientificFormat":"#E0","percentFormat":"#,##0%","currencyFormat":"¤ #,##0.00","decimal":",","currencySpacing-afterCurrency-currencyMatch":"[:letter:]","infinity":"∞","list":";","percentSign":"%","minusSign":"-","currencySpacing-beforeCurrency-surroundingMatch":"[:digit:]","currencySpacing-afterCurrency-insertBetween":" ","nan":"NaN","nativeZeroDigit":"0","plusSign":"+","currencySpacing-afterCurrency-surroundingMatch":"[:digit:]","currencySpacing-beforeCurrency-currencyMatch":"[:letter:]","perMille":"‰","patternDigit":"#","currencySpacing-beforeCurrency-insertBetween":" ","exponential":"E"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/ja-jp/number.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/ja-jp/number.js index 517085a8..4329dc1e 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/ja-jp/number.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/ja-jp/number.js @@ -1 +1 @@ -({"currencyFormat": "¤#,##0.00", "scientificFormat": "#E0", "currencySpacing-afterCurrency-currencyMatch": "[:letter:]", "infinity": "∞", "list": ";", "percentSign": "%", "minusSign": "-", "currencySpacing-beforeCurrency-surroundingMatch": "[:digit:]", "currencySpacing-afterCurrency-insertBetween": " ", "nan": "NaN", "nativeZeroDigit": "0", "plusSign": "+", "currencySpacing-afterCurrency-surroundingMatch": "[:digit:]", "currencySpacing-beforeCurrency-currencyMatch": "[:letter:]", "perMille": "‰", "group": ",", "percentFormat": "#,##0%", "decimalFormat": "#,##0.###", "decimal": ".", "patternDigit": "#", "currencySpacing-beforeCurrency-insertBetween": " ", "exponential": "E"}) \ No newline at end of file +({"currencyFormat":"¤#,##0.00","decimalFormat":"#,##0.###","group":",","scientificFormat":"#E0","percentFormat":"#,##0%","decimal":".","currencySpacing-afterCurrency-currencyMatch":"[:letter:]","infinity":"∞","list":";","percentSign":"%","minusSign":"-","currencySpacing-beforeCurrency-surroundingMatch":"[:digit:]","currencySpacing-afterCurrency-insertBetween":" ","nan":"NaN","nativeZeroDigit":"0","plusSign":"+","currencySpacing-afterCurrency-surroundingMatch":"[:digit:]","currencySpacing-beforeCurrency-currencyMatch":"[:letter:]","perMille":"‰","patternDigit":"#","currencySpacing-beforeCurrency-insertBetween":" ","exponential":"E"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/ja/currency.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/ja/currency.js index e374113d..76cd3d99 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/ja/currency.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/ja/currency.js @@ -1 +1 @@ -({"HKD_displayName": "香港ドル", "CHF_displayName": "スイス フラン", "JPY_symbol": "￥", "CAD_displayName": "カナダ ドル", "AUD_displayName": "オーストラリア ドル", "JPY_displayName": "日本円", "USD_displayName": "米ドル", "GBP_displayName": "英国ポンド", "EUR_displayName": "ユーロ", "USD_symbol": "$", "GBP_symbol": "£", "EUR_symbol": "€"}) \ No newline at end of file +({"HKD_displayName":"香港ドル","CHF_displayName":"スイス フラン","JPY_symbol":"￥","CAD_displayName":"カナダ ドル","CNY_displayName":"中国人民元","AUD_displayName":"オーストラリア ドル","JPY_displayName":"日本円","USD_displayName":"米ドル","CNY_symbol":"元","GBP_displayName":"英国ポンド","EUR_displayName":"ユーロ","USD_symbol":"US$","GBP_symbol":"UK£","EUR_symbol":"€"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/ja/gregorian.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/ja/gregorian.js index 6474cbdd..d064e30b 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/ja/gregorian.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/ja/gregorian.js @@ -1 +1 @@ -({"eraNames": ["紀元前", "西暦"], "timeFormat-full": "H'時'mm'分'ss'秒'z", "timeFormat-medium": "H:mm:ss", "eraAbbr": ["紀元前", "西暦"], "dateFormat-medium": "yyyy/MM/dd", "am": "午前", "months-format-abbr": ["1 月", "2 月", "3 月", "4 月", "5 月", "6 月", "7 月", "8 月", "9 月", "10 月", "11 月", "12 月"], "dateFormat-full": "yyyy'年'M'月'd'日'EEEE", "days-format-abbr": ["日", "月", "火", "水", "木", "金", "土"], "timeFormat-long": "H:mm:ss:z", "quarters-format-wide": ["第 1 四半期", "第 2 四半期", "第 3 四半期", "第 4 四半期"], "pm": "午後", "timeFormat-short": "H:mm", "months-format-wide": ["1 月", "2 月", "3 月", "4 月", "5 月", "6 月", "7 月", "8 月", "9 月", "10 月", "11 月", "12 月"], "days-standAlone-narrow": ["日", "月", "火", "水", "木", "金", "土"], "dateFormat-long": "yyyy'年'M'月'd'日'", "days-format-wide": ["日曜日", "月曜日", "火曜日", "水曜日", "木曜日", "金曜日", "土曜日"], "dateTimeFormats-appendItem-Second": "{0} ({2}: {1})", "field-dayperiod": "Dayperiod", "field-minute": "Minute", "field-weekday": "Day of the Week", "months-standAlone-narrow": ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"], "dateTimeFormats-appendItem-Year": "{0} {1}", "field-era": "Era", "field-hour": "Hour", "dateTimeFormats-appendItem-Week": "{0} ({2}: {1})", "dateTimeFormats-appendItem-Timezone": "{0} {1}", "dateTimeFormats-appendItem-Month": "{0} ({2}: {1})", "field-zone": "Zone", "dateTimeFormats-appendItem-Minute": "{0} ({2}: {1})", "quarters-format-abbreviated": ["Q1", "Q2", "Q3", "Q4"], "dateTimeFormat": "{1} {0}", "field-year": "Year", "dateTimeFormats-appendItem-Day": "{0} ({2}: {1})", "field-week": "Week", "field-month": "Month", "dateTimeFormats-appendItem-Quarter": "{0} ({2}: {1})", "field-second": "Second", "field-day": "Day", "dateTimeFormats-appendItem-Day-Of-Week": "{0} {1}", "dateTimeFormats-appendItem-Hour": "{0} ({2}: {1})", "dateFormat-short": "yy/MM/dd", "dateTimeFormats-appendItem-Era": "{0} {1}"}) \ No newline at end of file +({"field-dayperiod":"午前/午後","field-minute":"分","eraNames":["紀元前","西暦"],"field-weekday":"曜日","days-standAlone-wide":["日曜日","月曜日","火曜日","水曜日","木曜日","金曜日","土曜日"],"months-standAlone-narrow":["1","2","3","4","5","6","7","8","9","10","11","12"],"field-era":"時代","field-hour":"時","timeFormat-full":"H時mm分ss秒v","months-standAlone-abbr":["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],"days-standAlone-narrow":["日","月","火","水","木","金","土"],"eraAbbr":["紀元前","西暦"],"dateFormat-long":"yyyy年M月d日","timeFormat-medium":"H:mm:ss","field-zone":"タイムゾーン","dateFormat-medium":"yyyy/MM/dd","quarters-standAlone-wide":["第1四半期","第2四半期","第3四半期","第4四半期"],"dateTimeFormat":"{1} {0}","field-year":"年","quarters-standAlone-narrow":["1","2","3","4"],"months-standAlone-wide":["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],"field-week":"週","timeFormat-long":"HH:mm:ssz","months-format-abbr":["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],"timeFormat-short":"H:mm","field-month":"月","quarters-format-abbr":["Q1","Q2","Q3","Q4"],"days-format-abbr":["日","月","火","水","木","金","土"],"pm":"午後","days-format-narrow":["日","月","火","水","木","金","土"],"field-second":"秒","field-day":"日","am":"午前","days-standAlone-abbr":["日","月","火","水","木","金","土"],"dateFormat-short":"yy/MM/dd","dateFormat-full":"yyyy年M月d日EEEE","months-format-wide":["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],"dateTimeAvailableFormats":["d日(EEE)","GGGGy年M月d日","H時","H:mm","L","M/d(E)","LLL","M月d日(E)","M月d日(E)","M月d日","M月d日","MM/dd","M/d","d日","mm:ss","mm:ss","y","y/M","y/M/d(EEE)","y年M月","y年M月d日(EEE)","y年M月","y/Q","yyyyQQQ","y年M月","yy/Q","y年","yyyy/MM"],"quarters-format-wide":["第1四半期","第2四半期","第3四半期","第4四半期"],"days-format-wide":["日曜日","月曜日","火曜日","水曜日","木曜日","金曜日","土曜日"],"eraNarrow":["紀元前","西暦"],"dateTimeFormats-appendItem-Second":"{0} ({2}: {1})","dateTimeFormats-appendItem-Year":"{0} {1}","quarters-standAlone-abbr":["Q1","Q2","Q3","Q4"],"dateTimeFormats-appendItem-Week":"{0} ({2}: {1})","dateTimeFormats-appendItem-Timezone":"{0} {1}","dateTimeFormats-appendItem-Month":"{0} ({2}: {1})","dateTimeFormats-appendItem-Minute":"{0} ({2}: {1})","dateTimeFormats-appendItem-Day":"{0} ({2}: {1})","quarters-format-narrow":["1","2","3","4"],"dateTimeFormats-appendItem-Quarter":"{0} ({2}: {1})","dateTimeFormats-appendItem-Day-Of-Week":"{0} {1}","months-format-narrow":["1","2","3","4","5","6","7","8","9","10","11","12"],"dateTimeFormats-appendItem-Hour":"{0} ({2}: {1})","dateTimeFormats-appendItem-Era":"{0} {1}"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/ja/number.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/ja/number.js index 4b501746..90d87b94 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/ja/number.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/ja/number.js @@ -1 +1 @@ -({"currencyFormat":"¤#,##0.00","scientificFormat":"#E0","currencySpacing-afterCurrency-currencyMatch":"[:letter:]","infinity":"∞","list":";","percentSign":"%","minusSign":"-","currencySpacing-beforeCurrency-surroundingMatch":"[:digit:]","currencySpacing-afterCurrency-insertBetween":" ","nan":"NaN","nativeZeroDigit":"0","plusSign":"+","currencySpacing-afterCurrency-surroundingMatch":"[:digit:]","currencySpacing-beforeCurrency-currencyMatch":"[:letter:]","perMille":"‰","group":",","percentFormat":"#,##0%","decimalFormat":"#,##0.###","decimal":".","patternDigit":"#","currencySpacing-beforeCurrency-insertBetween":" ","exponential":"E"}) \ No newline at end of file +({"decimalFormat":"#,##0.###","group":",","scientificFormat":"#E0","percentFormat":"#,##0%","currencyFormat":"¤#,##0.00","decimal":".","currencySpacing-afterCurrency-currencyMatch":"[:letter:]","infinity":"∞","list":";","percentSign":"%","minusSign":"-","currencySpacing-beforeCurrency-surroundingMatch":"[:digit:]","currencySpacing-afterCurrency-insertBetween":" ","nan":"NaN","nativeZeroDigit":"0","plusSign":"+","currencySpacing-afterCurrency-surroundingMatch":"[:digit:]","currencySpacing-beforeCurrency-currencyMatch":"[:letter:]","perMille":"‰","patternDigit":"#","currencySpacing-beforeCurrency-insertBetween":" ","exponential":"E"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/ko-kr/gregorian.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/ko-kr/gregorian.js index 729f6d65..aef10c0f 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/ko-kr/gregorian.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/ko-kr/gregorian.js @@ -1 +1 @@ -({"timeFormat-medium": "a h:mm:ss", "timeFormat-short": "a h:mm", "dateFormat-medium": "yyyy. MM. dd", "pm": "오후", "timeFormat-full": "a hh'시' mm'분' ss'초' z", "months-standAlone-narrow": ["1월", "2월", "3월", "4월", "5월", "6월", "7월", "8월", "9월", "10월", "11월", "12월"], "eraNames": ["서력기원전", "서력기원"], "am": "오전", "days-standAlone-narrow": ["일", "월", "화", "수", "목", "금", "토"], "dateFormat-long": "yyyy'년' M'월' d'일'", "dateFormat-short": "yy. MM. dd", "months-format-wide": ["1월", "2월", "3월", "4월", "5월", "6월", "7월", "8월", "9월", "10월", "11월", "12월"], "months-format-abbr": ["1월", "2월", "3월", "4월", "5월", "6월", "7월", "8월", "9월", "10월", "11월", "12월"], "days-format-wide": ["일요일", "월요일", "화요일", "수요일", "목요일", "금요일", "토요일"], "timeFormat-long": "a hh'시' mm'분' ss'초'", "eraAbbr": ["기원전", "서기"], "dateFormat-full": "yyyy'년' M'월' d'일' EEEE", "days-format-abbr": ["일", "월", "화", "수", "목", "금", "토"], "dateTimeFormats-appendItem-Second": "{0} ({2}: {1})", "field-dayperiod": "Dayperiod", "field-minute": "Minute", "field-weekday": "Day of the Week", "dateTimeFormats-appendItem-Year": "{0} {1}", "field-era": "Era", "field-hour": "Hour", "dateTimeFormats-appendItem-Week": "{0} ({2}: {1})", "dateTimeFormats-appendItem-Timezone": "{0} {1}", "dateTimeFormats-appendItem-Month": "{0} ({2}: {1})", "field-zone": "Zone", "dateTimeFormats-appendItem-Minute": "{0} ({2}: {1})", "quarters-format-abbreviated": ["Q1", "Q2", "Q3", "Q4"], "dateTimeFormat": "{1} {0}", "field-year": "Year", "dateTimeFormats-appendItem-Day": "{0} ({2}: {1})", "field-week": "Week", "field-month": "Month", "dateTimeFormats-appendItem-Quarter": "{0} ({2}: {1})", "field-second": "Second", "field-day": "Day", "dateTimeFormats-appendItem-Day-Of-Week": "{0} {1}", "dateTimeFormats-appendItem-Hour": "{0} ({2}: {1})", "dateTimeFormats-appendItem-Era": "{0} {1}", "quarters-format-wide": ["Q1", "Q2", "Q3", "Q4"]}) \ No newline at end of file +({"timeFormat-medium":"a h:mm:ss","timeFormat-short":"a h:mm","field-dayperiod":"오전/오후","field-minute":"분","eraNames":["서력기원전","서력기원"],"field-weekday":"요일","days-standAlone-wide":["일요일","월요일","화요일","수요일","목요일","금요일","토요일"],"months-standAlone-narrow":["1월","2월","3월","4월","5월","6월","7월","8월","9월","10월","11월","12월"],"field-era":"연호","field-hour":"시","quarters-standAlone-abbr":["1분기","2분기","3분기","4분기"],"timeFormat-full":"a hh시 mm분 ss초 v","months-standAlone-abbr":["1월","2월","3월","4월","5월","6월","7월","8월","9월","10월","11월","12월"],"days-standAlone-narrow":["일","월","화","수","목","금","토"],"eraAbbr":["기원전","서기"],"dateFormat-long":"yyyy년 M월 d일","field-zone":"시간대","dateFormat-medium":"yyyy. M. d.","quarters-standAlone-wide":["제 1/4분기","제 2/4분기","제 3/4분기","제 4/4분기"],"dateTimeFormat":"{1} {0}","field-year":"년","quarters-standAlone-narrow":["1","2","3","4"],"months-standAlone-wide":["1월","2월","3월","4월","5월","6월","7월","8월","9월","10월","11월","12월"],"field-week":"주","timeFormat-long":"a hh시 mm분 ss초 z","months-format-abbr":["1월","2월","3월","4월","5월","6월","7월","8월","9월","10월","11월","12월"],"field-month":"월","quarters-format-abbr":["1분기","2분기","3분기","4분기"],"days-format-abbr":["일","월","화","수","목","금","토"],"pm":"오후","days-format-narrow":["일","월","화","수","목","금","토"],"field-second":"초","field-day":"일","months-format-narrow":["1월","2월","3월","4월","5월","6월","7월","8월","9월","10월","11월","12월"],"am":"오전","days-standAlone-abbr":["일","월","화","수","목","금","토"],"dateFormat-short":"yy. M. d.","dateFormat-full":"yyyy년 M월 d일 EEEE","months-format-wide":["1월","2월","3월","4월","5월","6월","7월","8월","9월","10월","11월","12월"],"dateTimeAvailableFormats":["d일 (E)","HH:mm","HH:mm:ss","H:mm","H시 m분 s초","L","M. d. (E)","LLL","MMM d일 (E)","MMMM d일 (E)","MMMM d일","MMM d일","MM. dd","M. d.","d","mm:ss","mm:ss","yyyy","yyyy. M.","yyyy. M. d. EEE","yyyy년 MMM","yyyy년 MMM d일 EEE","yyyy년 MMMM","yyyy년 Q분기","yyyy년 QQQ","YY. M.","yy년 MMM","yy년 Q분기","yyyy. MM"],"quarters-format-wide":["제 1/4분기","제 2/4분기","제 3/4분기","제 4/4분기"],"days-format-wide":["일요일","월요일","화요일","수요일","목요일","금요일","토요일"],"eraNarrow":["기원전","서기"],"dateTimeFormats-appendItem-Second":"{0} ({2}: {1})","dateTimeFormats-appendItem-Year":"{0} {1}","dateTimeFormats-appendItem-Week":"{0} ({2}: {1})","dateTimeFormats-appendItem-Timezone":"{0} {1}","dateTimeFormats-appendItem-Month":"{0} ({2}: {1})","dateTimeFormats-appendItem-Minute":"{0} ({2}: {1})","dateTimeFormats-appendItem-Day":"{0} ({2}: {1})","quarters-format-narrow":["1","2","3","4"],"dateTimeFormats-appendItem-Quarter":"{0} ({2}: {1})","dateTimeFormats-appendItem-Day-Of-Week":"{0} {1}","dateTimeFormats-appendItem-Hour":"{0} ({2}: {1})","dateTimeFormats-appendItem-Era":"{0} {1}"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/ko-kr/number.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/ko-kr/number.js index 517085a8..748ea804 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/ko-kr/number.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/ko-kr/number.js @@ -1 +1 @@ -({"currencyFormat": "¤#,##0.00", "scientificFormat": "#E0", "currencySpacing-afterCurrency-currencyMatch": "[:letter:]", "infinity": "∞", "list": ";", "percentSign": "%", "minusSign": "-", "currencySpacing-beforeCurrency-surroundingMatch": "[:digit:]", "currencySpacing-afterCurrency-insertBetween": " ", "nan": "NaN", "nativeZeroDigit": "0", "plusSign": "+", "currencySpacing-afterCurrency-surroundingMatch": "[:digit:]", "currencySpacing-beforeCurrency-currencyMatch": "[:letter:]", "perMille": "‰", "group": ",", "percentFormat": "#,##0%", "decimalFormat": "#,##0.###", "decimal": ".", "patternDigit": "#", "currencySpacing-beforeCurrency-insertBetween": " ", "exponential": "E"}) \ No newline at end of file +({"currencyFormat":"¤#,##0.00","group":",","percentSign":"%","exponential":"E","percentFormat":"#,##0%","scientificFormat":"#E0","list":";","infinity":"∞","patternDigit":"#","minusSign":"-","decimal":".","nan":"NaN","nativeZeroDigit":"0","perMille":"‰","decimalFormat":"#,##0.###","plusSign":"+","currencySpacing-afterCurrency-currencyMatch":"[:letter:]","currencySpacing-beforeCurrency-surroundingMatch":"[:digit:]","currencySpacing-afterCurrency-insertBetween":" ","currencySpacing-afterCurrency-surroundingMatch":"[:digit:]","currencySpacing-beforeCurrency-currencyMatch":"[:letter:]","currencySpacing-beforeCurrency-insertBetween":" "}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/ko/currency.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/ko/currency.js index 4d4c3b2f..bea8d9d6 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/ko/currency.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/ko/currency.js @@ -1 +1 @@ -({"HKD_displayName": "홍콩 달러", "CHF_displayName": "스위스 프랑달러", "JPY_symbol": "￥", "CAD_displayName": "캐나다 달러", "USD_symbol": "US$", "AUD_displayName": "호주 달러", "JPY_displayName": "일본 엔화", "USD_displayName": "미국 달러", "GBP_displayName": "영국령 파운드 스털링", "EUR_displayName": "유로화", "GBP_symbol": "£", "EUR_symbol": "€"}) \ No newline at end of file +({"HKD_displayName":"홍콩 달러","CHF_displayName":"스위스 프랑","JPY_symbol":"￥","HKD_symbol":"HK$","CAD_displayName":"캐나다 달러","CNY_displayName":"중국 위안 인민폐","AUD_displayName":"호주 달러","JPY_displayName":"일본 엔","CAD_symbol":"Can$","USD_displayName":"미국 달러","CNY_symbol":"¥","GBP_displayName":"영국령 파운드 스털링","AUD_symbol":"A$","EUR_displayName":"유로화","USD_symbol":"US$","GBP_symbol":"UK£","EUR_symbol":"€"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/ko/gregorian.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/ko/gregorian.js index 3b96e71a..feafdd1f 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/ko/gregorian.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/ko/gregorian.js @@ -1 +1 @@ -({"dateFormat-medium": "yyyy. MM. dd", "pm": "오후", "timeFormat-full": "a hh'시' mm'분' ss'초' z", "months-standAlone-narrow": ["1월", "2월", "3월", "4월", "5월", "6월", "7월", "8월", "9월", "10월", "11월", "12월"], "eraNames": ["서력기원전", "서력기원"], "am": "오전", "days-standAlone-narrow": ["일", "월", "화", "수", "목", "금", "토"], "timeFormat-medium": "a hh'시' mm'분'", "dateFormat-long": "yyyy'년' M'월' d'일'", "dateFormat-short": "yy. MM. dd", "months-format-wide": ["1월", "2월", "3월", "4월", "5월", "6월", "7월", "8월", "9월", "10월", "11월", "12월"], "timeFormat-short": "a hh'시' mm'분'", "months-format-abbr": ["1월", "2월", "3월", "4월", "5월", "6월", "7월", "8월", "9월", "10월", "11월", "12월"], "days-format-wide": ["일요일", "월요일", "화요일", "수요일", "목요일", "금요일", "토요일"], "timeFormat-long": "a hh'시' mm'분' ss'초'", "eraAbbr": ["기원전", "서기"], "dateFormat-full": "yyyy'년' M'월' d'일' EEEE", "days-format-abbr": ["일", "월", "화", "수", "목", "금", "토"], "dateTimeFormats-appendItem-Second": "{0} ({2}: {1})", "field-dayperiod": "Dayperiod", "field-minute": "Minute", "field-weekday": "Day of the Week", "dateTimeFormats-appendItem-Year": "{0} {1}", "field-era": "Era", "field-hour": "Hour", "dateTimeFormats-appendItem-Week": "{0} ({2}: {1})", "dateTimeFormats-appendItem-Timezone": "{0} {1}", "dateTimeFormats-appendItem-Month": "{0} ({2}: {1})", "field-zone": "Zone", "dateTimeFormats-appendItem-Minute": "{0} ({2}: {1})", "quarters-format-abbreviated": ["Q1", "Q2", "Q3", "Q4"], "dateTimeFormat": "{1} {0}", "field-year": "Year", "dateTimeFormats-appendItem-Day": "{0} ({2}: {1})", "field-week": "Week", "field-month": "Month", "dateTimeFormats-appendItem-Quarter": "{0} ({2}: {1})", "field-second": "Second", "field-day": "Day", "dateTimeFormats-appendItem-Day-Of-Week": "{0} {1}", "dateTimeFormats-appendItem-Hour": "{0} ({2}: {1})", "dateTimeFormats-appendItem-Era": "{0} {1}", "quarters-format-wide": ["Q1", "Q2", "Q3", "Q4"]}) \ No newline at end of file +({"field-dayperiod":"오전/오후","field-minute":"분","eraNames":["서력기원전","서력기원"],"field-weekday":"요일","days-standAlone-wide":["일요일","월요일","화요일","수요일","목요일","금요일","토요일"],"months-standAlone-narrow":["1월","2월","3월","4월","5월","6월","7월","8월","9월","10월","11월","12월"],"field-era":"연호","field-hour":"시","quarters-standAlone-abbr":["1분기","2분기","3분기","4분기"],"timeFormat-full":"a hh시 mm분 ss초 v","months-standAlone-abbr":["1월","2월","3월","4월","5월","6월","7월","8월","9월","10월","11월","12월"],"days-standAlone-narrow":["일","월","화","수","목","금","토"],"eraAbbr":["기원전","서기"],"dateFormat-long":"yyyy년 M월 d일","timeFormat-medium":"a h:mm:ss","field-zone":"시간대","dateFormat-medium":"yyyy. M. d.","quarters-standAlone-wide":["제 1/4분기","제 2/4분기","제 3/4분기","제 4/4분기"],"dateTimeFormat":"{1} {0}","field-year":"년","quarters-standAlone-narrow":["1","2","3","4"],"months-standAlone-wide":["1월","2월","3월","4월","5월","6월","7월","8월","9월","10월","11월","12월"],"field-week":"주","timeFormat-long":"a hh시 mm분 ss초 z","months-format-abbr":["1월","2월","3월","4월","5월","6월","7월","8월","9월","10월","11월","12월"],"timeFormat-short":"a h:mm","field-month":"월","quarters-format-abbr":["1분기","2분기","3분기","4분기"],"days-format-abbr":["일","월","화","수","목","금","토"],"pm":"오후","days-format-narrow":["일","월","화","수","목","금","토"],"field-second":"초","field-day":"일","months-format-narrow":["1월","2월","3월","4월","5월","6월","7월","8월","9월","10월","11월","12월"],"am":"오전","days-standAlone-abbr":["일","월","화","수","목","금","토"],"dateFormat-short":"yy. M. d.","dateFormat-full":"yyyy년 M월 d일 EEEE","months-format-wide":["1월","2월","3월","4월","5월","6월","7월","8월","9월","10월","11월","12월"],"dateTimeAvailableFormats":["d일 (E)","HH:mm","HH:mm:ss","H:mm","H시 m분 s초","L","M. d. (E)","LLL","MMM d일 (E)","MMMM d일 (E)","MMMM d일","MMM d일","MM. dd","M. d.","d","mm:ss","mm:ss","yyyy","yyyy. M.","yyyy. M. d. EEE","yyyy년 MMM","yyyy년 MMM d일 EEE","yyyy년 MMMM","yyyy년 Q분기","yyyy년 QQQ","YY. M.","yy년 MMM","yy년 Q분기","yyyy. MM"],"quarters-format-wide":["제 1/4분기","제 2/4분기","제 3/4분기","제 4/4분기"],"days-format-wide":["일요일","월요일","화요일","수요일","목요일","금요일","토요일"],"eraNarrow":["기원전","서기"],"dateTimeFormats-appendItem-Second":"{0} ({2}: {1})","dateTimeFormats-appendItem-Year":"{0} {1}","dateTimeFormats-appendItem-Week":"{0} ({2}: {1})","dateTimeFormats-appendItem-Timezone":"{0} {1}","dateTimeFormats-appendItem-Month":"{0} ({2}: {1})","dateTimeFormats-appendItem-Minute":"{0} ({2}: {1})","dateTimeFormats-appendItem-Day":"{0} ({2}: {1})","quarters-format-narrow":["1","2","3","4"],"dateTimeFormats-appendItem-Quarter":"{0} ({2}: {1})","dateTimeFormats-appendItem-Day-Of-Week":"{0} {1}","dateTimeFormats-appendItem-Hour":"{0} ({2}: {1})","dateTimeFormats-appendItem-Era":"{0} {1}"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/ko/number.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/ko/number.js index 4b501746..b155b913 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/ko/number.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/ko/number.js @@ -1 +1 @@ -({"currencyFormat":"¤#,##0.00","scientificFormat":"#E0","currencySpacing-afterCurrency-currencyMatch":"[:letter:]","infinity":"∞","list":";","percentSign":"%","minusSign":"-","currencySpacing-beforeCurrency-surroundingMatch":"[:digit:]","currencySpacing-afterCurrency-insertBetween":" ","nan":"NaN","nativeZeroDigit":"0","plusSign":"+","currencySpacing-afterCurrency-surroundingMatch":"[:digit:]","currencySpacing-beforeCurrency-currencyMatch":"[:letter:]","perMille":"‰","group":",","percentFormat":"#,##0%","decimalFormat":"#,##0.###","decimal":".","patternDigit":"#","currencySpacing-beforeCurrency-insertBetween":" ","exponential":"E"}) \ No newline at end of file +({"group":",","percentSign":"%","exponential":"E","percentFormat":"#,##0%","scientificFormat":"#E0","list":";","infinity":"∞","patternDigit":"#","minusSign":"-","decimal":".","nan":"NaN","nativeZeroDigit":"0","perMille":"‰","decimalFormat":"#,##0.###","currencyFormat":"¤#,##0.00","plusSign":"+","currencySpacing-afterCurrency-currencyMatch":"[:letter:]","currencySpacing-beforeCurrency-surroundingMatch":"[:digit:]","currencySpacing-afterCurrency-insertBetween":" ","currencySpacing-afterCurrency-surroundingMatch":"[:digit:]","currencySpacing-beforeCurrency-currencyMatch":"[:letter:]","currencySpacing-beforeCurrency-insertBetween":" "}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/number.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/number.js index f669d5c7..8f762162 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/number.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/number.js @@ -1 +1 @@ -({"scientificFormat": "#E0", "currencySpacing-afterCurrency-currencyMatch": "[:letter:]", "infinity": "∞", "list": ";", "percentSign": "%", "minusSign": "-", "currencySpacing-beforeCurrency-surroundingMatch": "[:digit:]", "currencySpacing-afterCurrency-insertBetween": " ", "nan": "NaN", "nativeZeroDigit": "0", "plusSign": "+", "currencySpacing-afterCurrency-surroundingMatch": "[:digit:]", "currencyFormat": "¤ #,##0.00", "currencySpacing-beforeCurrency-currencyMatch": "[:letter:]", "perMille": "‰", "group": ",", "percentFormat": "#,##0%", "decimalFormat": "#,##0.###", "decimal": ".", "patternDigit": "#", "currencySpacing-beforeCurrency-insertBetween": " ", "exponential": "E"}) \ No newline at end of file +({"scientificFormat":"#E0","currencySpacing-afterCurrency-currencyMatch":"[:letter:]","infinity":"∞","list":";","percentSign":"%","minusSign":"-","currencySpacing-beforeCurrency-surroundingMatch":"[:digit:]","currencySpacing-afterCurrency-insertBetween":" ","nan":"NaN","nativeZeroDigit":"0","plusSign":"+","currencySpacing-afterCurrency-surroundingMatch":"[:digit:]","currencyFormat":"¤ #,##0.00","currencySpacing-beforeCurrency-currencyMatch":"[:letter:]","perMille":"‰","group":",","percentFormat":"#,##0%","decimalFormat":"#,##0.###","decimal":".","patternDigit":"#","currencySpacing-beforeCurrency-insertBetween":" ","exponential":"E"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/pt-br/gregorian.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/pt-br/gregorian.js index 4b74b079..074d994f 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/pt-br/gregorian.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/pt-br/gregorian.js @@ -1 +1 @@ -({"field-hour": "Hora", "field-dayperiod": "Período do dia", "field-minute": "Minuto", "timeFormat-full": "HH'h'mm'min'ss's' z", "field-week": "Semana", "field-weekday": "Dia da semana", "field-second": "Segundo", "dateFormat-medium": "dd/MM/yyyy", "field-day": "Dia", "timeFormat-long": "H'h'm'min's's' z", "field-month": "Mês", "field-year": "Ano", "dateFormat-short": "dd/MM/yy", "field-zone": "Fuso", "eraAbbr": ["a.C.", "d.C."], "months-format-abbr": ["jan", "fev", "mar", "abr", "mai", "jun", "jul", "ago", "set", "out", "nov", "dez"], "dateFormat-full": "EEEE, d' de 'MMMM' de 'yyyy", "days-format-abbr": ["dom", "seg", "ter", "qua", "qui", "sex", "sáb"], "quarters-format-wide": ["1º trimestre", "2º trimestre", "3º trimestre", "4º trimestre"], "quarters-format-abbreviated": ["T1", "T2", "T3", "T4"], "months-format-wide": ["janeiro", "fevereiro", "março", "abril", "maio", "junho", "julho", "agosto", "setembro", "outubro", "novembro", "dezembro"], "months-standAlone-narrow": ["J", "F", "M", "A", "M", "J", "J", "A", "S", "O", "N", "D"], "days-standAlone-narrow": ["D", "S", "T", "Q", "Q", "S", "S"], "dateFormat-long": "d' de 'MMMM' de 'yyyy", "days-format-wide": ["domingo", "segunda-feira", "terça-feira", "quarta-feira", "quinta-feira", "sexta-feira", "sábado"], "dateTimeFormats-appendItem-Second": "{0} ({2}: {1})", "eraNames": ["BCE", "CE"], "dateTimeFormats-appendItem-Year": "{0} {1}", "field-era": "Era", "dateTimeFormats-appendItem-Week": "{0} ({2}: {1})", "dateTimeFormats-appendItem-Timezone": "{0} {1}", "dateTimeFormats-appendItem-Month": "{0} ({2}: {1})", "timeFormat-medium": "HH:mm:ss", "dateTimeFormats-appendItem-Minute": "{0} ({2}: {1})", "dateTimeFormat": "{1} {0}", "dateTimeFormats-appendItem-Day": "{0} ({2}: {1})", "timeFormat-short": "HH:mm", "dateTimeFormats-appendItem-Quarter": "{0} ({2}: {1})", "pm": "PM", "dateTimeFormats-appendItem-Day-Of-Week": "{0} {1}", "dateTimeFormats-appendItem-Hour": "{0} ({2}: {1})", "am": "AM", "dateTimeFormats-appendItem-Era": "{0} {1}"}) \ No newline at end of file +({"field-hour":"Hora","field-dayperiod":"Período do dia","field-minute":"Minuto","timeFormat-full":"HH'h'mm'min'ss's' z","field-week":"Semana","field-weekday":"Dia da semana","field-second":"Segundo","dateFormat-medium":"dd/MM/yyyy","field-day":"Dia","timeFormat-long":"H'h'm'min's's' z","field-month":"Mês","field-year":"Ano","dateFormat-short":"dd/MM/yy","field-zone":"Fuso","eraNames":["Antes de Cristo","Ano do Senhor"],"days-standAlone-wide":["domingo","segunda-feira","terça-feira","quarta-feira","quinta-feira","sexta-feira","sábado"],"months-standAlone-narrow":["J","F","M","A","M","J","J","A","S","O","N","D"],"field-era":"Era","quarters-standAlone-abbr":["T1","T2","T3","T4"],"months-standAlone-abbr":["jan","fev","mar","abr","mai","jun","jul","ago","set","out","nov","dez"],"days-standAlone-narrow":["D","S","T","Q","Q","S","S"],"eraAbbr":["a.C.","d.C."],"dateFormat-long":"d 'de' MMMM 'de' yyyy","timeFormat-medium":"HH:mm:ss","quarters-standAlone-wide":["1º trimestre","2º trimestre","3º trimestre","4º trimestre"],"dateTimeFormat":"{1} {0}","quarters-standAlone-narrow":["1","2","3","4"],"months-standAlone-wide":["janeiro","fevereiro","março","abril","maio","junho","julho","agosto","setembro","outubro","novembro","dezembro"],"months-format-abbr":["jan","fev","mar","abr","mai","jun","jul","ago","set","out","nov","dez"],"timeFormat-short":"HH:mm","quarters-format-abbr":["T1","T2","T3","T4"],"days-format-abbr":["dom","seg","ter","qua","qui","sex","sáb"],"pm":"PM","days-format-narrow":["D","S","T","Q","Q","S","S"],"months-format-narrow":["J","F","M","A","M","J","J","A","S","O","N","D"],"am":"AM","days-standAlone-abbr":["dom","seg","ter","qua","qui","sex","sáb"],"dateFormat-full":"EEEE, d 'de' MMMM 'de' yyyy","months-format-wide":["janeiro","fevereiro","março","abril","maio","junho","julho","agosto","setembro","outubro","novembro","dezembro"],"dateTimeAvailableFormats":["HH:mm","HH:mm:ss","H:mm","L","EEE, dd/MM","LLL","EEE, d MMM","EEE, d MMMM","d MMMM","d MMM","dd/MM","d/M","d","mm:ss","mm:ss","yyyy","MM/yyyy","EEE, dd/MM/yyyy","MMM 'de' yyyy","EEE, d 'de' MMM 'de' yyyy","MMMM 'de' yyyy","yyyy Q","yyyy QQQ","MM/yy","MMM yy","EEE, d 'de' MMM 'de' yy","d 'de' MMM 'de' yy","Q yy","MM/yyyy","MMM 'de' yyyy"],"quarters-format-wide":["1º trimestre","2º trimestre","3º trimestre","4º trimestre"],"days-format-wide":["domingo","segunda-feira","terça-feira","quarta-feira","quinta-feira","sexta-feira","sábado"],"eraNarrow":["a.C.","d.C."],"dateTimeFormats-appendItem-Second":"{0} ({2}: {1})","dateTimeFormats-appendItem-Year":"{0} {1}","dateTimeFormats-appendItem-Week":"{0} ({2}: {1})","dateTimeFormats-appendItem-Timezone":"{0} {1}","dateTimeFormats-appendItem-Month":"{0} ({2}: {1})","dateTimeFormats-appendItem-Minute":"{0} ({2}: {1})","dateTimeFormats-appendItem-Day":"{0} ({2}: {1})","quarters-format-narrow":["1","2","3","4"],"dateTimeFormats-appendItem-Quarter":"{0} ({2}: {1})","dateTimeFormats-appendItem-Day-Of-Week":"{0} {1}","dateTimeFormats-appendItem-Hour":"{0} ({2}: {1})","dateTimeFormats-appendItem-Era":"{0} {1}"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/pt/currency.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/pt/currency.js index d4ac751b..7643be6e 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/pt/currency.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/pt/currency.js @@ -1 +1 @@ -({"EUR_displayName": "Euro", "CHF_displayName": "Franco suíço", "HKD_displayName": "Dólar de Hong Kong", "CAD_displayName": "Dólar canadense", "GBP_displayName": "Libra esterlina britânica", "JPY_displayName": "Iene japonês", "AUD_displayName": "Dólar australiano", "USD_displayName": "Dólar norte-americano", "USD_symbol": "$", "GBP_symbol": "£", "JPY_symbol": "¥", "EUR_symbol": "€"}) \ No newline at end of file +({"HKD_displayName":"Dólar de Hong Kong","CHF_displayName":"Franco suíço","CHF_symbol":"SwF","JPY_symbol":"¥","HKD_symbol":"HK$","CAD_displayName":"Dólar canadense","CNY_displayName":"Yuan Renminbi chinês","AUD_displayName":"Dólar australiano","JPY_displayName":"Iene japonês","CAD_symbol":"Can$","USD_displayName":"Dólar norte-americano","CNY_symbol":"Y","GBP_displayName":"Libra esterlina britânica","GBP_symbol":"£","AUD_symbol":"$A","EUR_displayName":"Euro","USD_symbol":"US$","EUR_symbol":"€"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/pt/gregorian.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/pt/gregorian.js index 0d8e9bc4..511843ea 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/pt/gregorian.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/pt/gregorian.js @@ -1 +1 @@ -({"timeFormat-full": "HH'H'mm'm'ss's' z", "eraAbbr": ["a.C.", "d.C."], "dateFormat-medium": "d/MMM/yyyy", "months-format-abbr": ["jan", "fev", "mar", "abr", "mai", "jun", "jul", "ago", "set", "out", "nov", "dez"], "dateFormat-full": "EEEE, d' de 'MMMM' de 'yyyy", "days-format-abbr": ["dom", "seg", "ter", "qua", "qui", "sex", "sáb"], "quarters-format-wide": ["1º trimestre", "2º trimestre", "3º trimestre", "4º trimestre"], "dateFormat-short": "dd-MM-yyyy", "quarters-format-abbreviated": ["T1", "T2", "T3", "T4"], "months-format-wide": ["janeiro", "fevereiro", "março", "abril", "maio", "junho", "julho", "agosto", "setembro", "outubro", "novembro", "dezembro"], "months-standAlone-narrow": ["J", "F", "M", "A", "M", "J", "J", "A", "S", "O", "N", "D"], "days-standAlone-narrow": ["D", "S", "T", "Q", "Q", "S", "S"], "dateFormat-long": "d' de 'MMMM' de 'yyyy", "days-format-wide": ["domingo", "segunda-feira", "terça-feira", "quarta-feira", "quinta-feira", "sexta-feira", "sábado"], "dateTimeFormats-appendItem-Second": "{0} ({2}: {1})", "field-dayperiod": "Dayperiod", "field-minute": "Minute", "eraNames": ["BCE", "CE"], "field-weekday": "Day of the Week", "dateTimeFormats-appendItem-Year": "{0} {1}", "field-era": "Era", "field-hour": "Hour", "dateTimeFormats-appendItem-Week": "{0} ({2}: {1})", "dateTimeFormats-appendItem-Timezone": "{0} {1}", "dateTimeFormats-appendItem-Month": "{0} ({2}: {1})", "timeFormat-medium": "HH:mm:ss", "field-zone": "Zone", "dateTimeFormats-appendItem-Minute": "{0} ({2}: {1})", "dateTimeFormat": "{1} {0}", "field-year": "Year", "dateTimeFormats-appendItem-Day": "{0} ({2}: {1})", "field-week": "Week", "timeFormat-long": "HH:mm:ss z", "timeFormat-short": "HH:mm", "field-month": "Month", "dateTimeFormats-appendItem-Quarter": "{0} ({2}: {1})", "pm": "PM", "field-second": "Second", "field-day": "Day", "dateTimeFormats-appendItem-Day-Of-Week": "{0} {1}", "dateTimeFormats-appendItem-Hour": "{0} ({2}: {1})", "am": "AM", "dateTimeFormats-appendItem-Era": "{0} {1}"}) \ No newline at end of file +({"field-dayperiod":"Período do dia","field-minute":"Minuto","eraNames":["Antes de Cristo","Ano do Senhor"],"field-weekday":"Dia da semana","days-standAlone-wide":["domingo","segunda-feira","terça-feira","quarta-feira","quinta-feira","sexta-feira","sábado"],"months-standAlone-narrow":["J","F","M","A","M","J","J","A","S","O","N","D"],"field-era":"Era","field-hour":"Hora","quarters-standAlone-abbr":["T1","T2","T3","T4"],"timeFormat-full":"HH'h'mm'min'ss's' v","months-standAlone-abbr":["jan","fev","mar","abr","mai","jun","jul","ago","set","out","nov","dez"],"days-standAlone-narrow":["D","S","T","Q","Q","S","S"],"eraAbbr":["a.C.","d.C."],"dateFormat-long":"d 'de' MMMM 'de' yyyy","timeFormat-medium":"HH:mm:ss","field-zone":"Fuso","dateFormat-medium":"dd/MM/yyyy","quarters-standAlone-wide":["1º trimestre","2º trimestre","3º trimestre","4º trimestre"],"dateTimeFormat":"{1} {0}","field-year":"Ano","quarters-standAlone-narrow":["1","2","3","4"],"months-standAlone-wide":["janeiro","fevereiro","março","abril","maio","junho","julho","agosto","setembro","outubro","novembro","dezembro"],"field-week":"Semana","timeFormat-long":"HH:mm:ss z","months-format-abbr":["jan","fev","mar","abr","mai","jun","jul","ago","set","out","nov","dez"],"timeFormat-short":"HH:mm","field-month":"Mês","quarters-format-abbr":["T1","T2","T3","T4"],"days-format-abbr":["dom","seg","ter","qua","qui","sex","sáb"],"pm":"PM","days-format-narrow":["D","S","T","Q","Q","S","S"],"field-second":"Segundo","field-day":"Dia","months-format-narrow":["J","F","M","A","M","J","J","A","S","O","N","D"],"am":"AM","days-standAlone-abbr":["dom","seg","ter","qua","qui","sex","sáb"],"dateFormat-short":"dd/MM/yy","dateFormat-full":"EEEE, d 'de' MMMM 'de' yyyy","months-format-wide":["janeiro","fevereiro","março","abril","maio","junho","julho","agosto","setembro","outubro","novembro","dezembro"],"dateTimeAvailableFormats":["HH:mm","HH:mm:ss","H:mm","L","EEE, dd/MM","LLL","EEE, d MMM","EEE, d MMMM","d MMMM","d MMM","dd/MM","d/M","d","mm:ss","mm:ss","yyyy","MM/yyyy","EEE, dd/MM/yyyy","MMM 'de' yyyy","EEE, d 'de' MMM 'de' yyyy","MMMM 'de' yyyy","yyyy Q","yyyy QQQ","MM/yy","MMM yy","EEE, d 'de' MMM 'de' yy","d 'de' MMM 'de' yy","Q yy","MM/yyyy","MMM 'de' yyyy"],"quarters-format-wide":["1º trimestre","2º trimestre","3º trimestre","4º trimestre"],"days-format-wide":["domingo","segunda-feira","terça-feira","quarta-feira","quinta-feira","sexta-feira","sábado"],"eraNarrow":["a.C.","d.C."],"dateTimeFormats-appendItem-Second":"{0} ({2}: {1})","dateTimeFormats-appendItem-Year":"{0} {1}","dateTimeFormats-appendItem-Week":"{0} ({2}: {1})","dateTimeFormats-appendItem-Timezone":"{0} {1}","dateTimeFormats-appendItem-Month":"{0} ({2}: {1})","dateTimeFormats-appendItem-Minute":"{0} ({2}: {1})","dateTimeFormats-appendItem-Day":"{0} ({2}: {1})","quarters-format-narrow":["1","2","3","4"],"dateTimeFormats-appendItem-Quarter":"{0} ({2}: {1})","dateTimeFormats-appendItem-Day-Of-Week":"{0} {1}","dateTimeFormats-appendItem-Hour":"{0} ({2}: {1})","dateTimeFormats-appendItem-Era":"{0} {1}"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/pt/number.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/pt/number.js index 0de8f27d..f10fcfa2 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/pt/number.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/pt/number.js @@ -1 +1 @@ -({"group": ".", "decimal": ",", "scientificFormat": "#E0", "currencySpacing-afterCurrency-currencyMatch": "[:letter:]", "infinity": "∞", "list": ";", "percentSign": "%", "minusSign": "-", "currencySpacing-beforeCurrency-surroundingMatch": "[:digit:]", "currencySpacing-afterCurrency-insertBetween": " ", "nan": "NaN", "nativeZeroDigit": "0", "plusSign": "+", "currencySpacing-afterCurrency-surroundingMatch": "[:digit:]", "currencyFormat": "¤ #,##0.00", "currencySpacing-beforeCurrency-currencyMatch": "[:letter:]", "perMille": "‰", "percentFormat": "#,##0%", "decimalFormat": "#,##0.###", "patternDigit": "#", "currencySpacing-beforeCurrency-insertBetween": " ", "exponential": "E"}) \ No newline at end of file +({"group":".","percentSign":"%","exponential":"E","percentFormat":"#,##0%","scientificFormat":"#E0","list":";","infinity":"∞","patternDigit":"#","minusSign":"-","decimal":",","nan":"NaN","nativeZeroDigit":"0","perMille":"‰","decimalFormat":"#,##0.###","currencyFormat":"¤#,##0.00;(¤#,##0.00)","plusSign":"+","currencySpacing-afterCurrency-currencyMatch":"[:letter:]","currencySpacing-beforeCurrency-surroundingMatch":"[:digit:]","currencySpacing-afterCurrency-insertBetween":" ","currencySpacing-afterCurrency-surroundingMatch":"[:digit:]","currencySpacing-beforeCurrency-currencyMatch":"[:letter:]","currencySpacing-beforeCurrency-insertBetween":" "}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/zh-cn/gregorian.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/zh-cn/gregorian.js index ec46230f..08dd13fd 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/zh-cn/gregorian.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/zh-cn/gregorian.js @@ -1 +1 @@ -({"dateFormat-short": "yy-M-d", "timeFormat-long": "ahh'时'mm'分'ss'秒'", "dateFormat-medium": "yyyy-M-d", "dateFormat-long": "yyyy'年'M'月'd'日'", "timeFormat-medium": "ahh:mm:ss", "timeFormat-short": "ah:mm", "timeFormat-full": "ahh'时'mm'分'ss'秒' z", "dateFormat-full": "yyyy'年'M'月'd'日'EEEE", "eraAbbr": ["公元前", "公元"], "am": "上午", "months-format-abbr": ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"], "days-format-abbr": ["周日", "周一", "周二", "周三", "周四", "周五", "周六"], "pm": "下午", "months-format-wide": ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"], "months-standAlone-narrow": ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"], "days-standAlone-narrow": ["日", "一", "二", "三", "四", "五", "六"], "days-format-wide": ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"], "dateTimeFormats-appendItem-Second": "{0} ({2}: {1})", "field-dayperiod": "Dayperiod", "field-minute": "Minute", "eraNames": ["BCE", "CE"], "field-weekday": "Day of the Week", "dateTimeFormats-appendItem-Year": "{0} {1}", "field-era": "Era", "field-hour": "Hour", "dateTimeFormats-appendItem-Week": "{0} ({2}: {1})", "dateTimeFormats-appendItem-Timezone": "{0} {1}", "dateTimeFormats-appendItem-Month": "{0} ({2}: {1})", "field-zone": "Zone", "dateTimeFormats-appendItem-Minute": "{0} ({2}: {1})", "quarters-format-abbreviated": ["Q1", "Q2", "Q3", "Q4"], "dateTimeFormat": "{1} {0}", "field-year": "Year", "dateTimeFormats-appendItem-Day": "{0} ({2}: {1})", "field-week": "Week", "field-month": "Month", "dateTimeFormats-appendItem-Quarter": "{0} ({2}: {1})", "field-second": "Second", "field-day": "Day", "dateTimeFormats-appendItem-Day-Of-Week": "{0} {1}", "dateTimeFormats-appendItem-Hour": "{0} ({2}: {1})", "dateTimeFormats-appendItem-Era": "{0} {1}", "quarters-format-wide": ["Q1", "Q2", "Q3", "Q4"]}) \ No newline at end of file +({"dateFormat-short":"yy-M-d","timeFormat-long":"ahh'时'mm'分'ss'秒'","dateFormat-medium":"yyyy-M-d","dateFormat-long":"yyyy'年'M'月'd'日'","timeFormat-medium":"ahh:mm:ss","timeFormat-short":"ah:mm","timeFormat-full":"ahh'时'mm'分'ss'秒' z","dateFormat-full":"yyyy'年'M'月'd'日'EEEE","field-dayperiod":"上午/下午","field-minute":"分钟","eraNames":["公元前","公元"],"field-weekday":"周天","days-standAlone-wide":["星期日","星期一","星期二","星期三","星期四","星期五","星期六"],"months-standAlone-narrow":["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],"field-era":"时期","field-hour":"小时","quarters-standAlone-abbr":["1季","2季","3季","4季"],"months-standAlone-abbr":["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],"days-standAlone-narrow":["日","一","二","三","四","五","六"],"eraAbbr":["公元前","公元"],"field-zone":"区域","quarters-standAlone-wide":["第1季度","第2季度","第3季度","第4季度"],"dateTimeFormat":"{1} {0}","field-year":"年","quarters-standAlone-narrow":["1","2","3","4"],"months-standAlone-wide":["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],"field-week":"周","months-format-abbr":["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],"field-month":"月","quarters-format-abbr":["1季","2季","3季","4季"],"days-format-abbr":["周日","周一","周二","周三","周四","周五","周六"],"pm":"下午","days-format-narrow":["日","一","二","三","四","五","六"],"field-second":"秒钟","field-day":"日","months-format-narrow":["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],"am":"上午","days-standAlone-abbr":["周日","周一","周二","周三","周四","周五","周六"],"months-format-wide":["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],"dateTimeAvailableFormats":["d日E","H时","HH:mm","HH:mm:ss","H:mm","L","M-dE","LLL","MMMd日E","MMMMd日E","MMMMd日","MMMMdd日","MMMd日","MM-dd","M-d","d日","mm:ss","mm:ss","yyyy年","yyyy-M","yyyy年M月d日，E","yyyy年MMM","yyyy年MMMd日EEE","yyyy年MMMM","yyyy年QQQ","y年QQQ","yy-MM","yy年MMM","yy年第Q季度","yyyy年","yyyy年M月","yyyy年MMMM"],"quarters-format-wide":["第1季度","第2季度","第3季度","第4季度"],"days-format-wide":["星期日","星期一","星期二","星期三","星期四","星期五","星期六"],"eraNarrow":["公元前","公元"],"dateTimeFormats-appendItem-Second":"{0} ({2}: {1})","dateTimeFormats-appendItem-Year":"{0} {1}","dateTimeFormats-appendItem-Week":"{0} ({2}: {1})","dateTimeFormats-appendItem-Timezone":"{0} {1}","dateTimeFormats-appendItem-Month":"{0} ({2}: {1})","dateTimeFormats-appendItem-Minute":"{0} ({2}: {1})","dateTimeFormats-appendItem-Day":"{0} ({2}: {1})","quarters-format-narrow":["1","2","3","4"],"dateTimeFormats-appendItem-Quarter":"{0} ({2}: {1})","dateTimeFormats-appendItem-Day-Of-Week":"{0} {1}","dateTimeFormats-appendItem-Hour":"{0} ({2}: {1})","dateTimeFormats-appendItem-Era":"{0} {1}"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/zh-cn/number.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/zh-cn/number.js index 517085a8..4329dc1e 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/zh-cn/number.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/zh-cn/number.js @@ -1 +1 @@ -({"currencyFormat": "¤#,##0.00", "scientificFormat": "#E0", "currencySpacing-afterCurrency-currencyMatch": "[:letter:]", "infinity": "∞", "list": ";", "percentSign": "%", "minusSign": "-", "currencySpacing-beforeCurrency-surroundingMatch": "[:digit:]", "currencySpacing-afterCurrency-insertBetween": " ", "nan": "NaN", "nativeZeroDigit": "0", "plusSign": "+", "currencySpacing-afterCurrency-surroundingMatch": "[:digit:]", "currencySpacing-beforeCurrency-currencyMatch": "[:letter:]", "perMille": "‰", "group": ",", "percentFormat": "#,##0%", "decimalFormat": "#,##0.###", "decimal": ".", "patternDigit": "#", "currencySpacing-beforeCurrency-insertBetween": " ", "exponential": "E"}) \ No newline at end of file +({"currencyFormat":"¤#,##0.00","decimalFormat":"#,##0.###","group":",","scientificFormat":"#E0","percentFormat":"#,##0%","decimal":".","currencySpacing-afterCurrency-currencyMatch":"[:letter:]","infinity":"∞","list":";","percentSign":"%","minusSign":"-","currencySpacing-beforeCurrency-surroundingMatch":"[:digit:]","currencySpacing-afterCurrency-insertBetween":" ","nan":"NaN","nativeZeroDigit":"0","plusSign":"+","currencySpacing-afterCurrency-surroundingMatch":"[:digit:]","currencySpacing-beforeCurrency-currencyMatch":"[:letter:]","perMille":"‰","patternDigit":"#","currencySpacing-beforeCurrency-insertBetween":" ","exponential":"E"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/zh-tw/currency.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/zh-tw/currency.js index 98b36404..4dc73890 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/zh-tw/currency.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/zh-tw/currency.js @@ -1 +1 @@ -({"EUR_displayName":"歐元","CAD_displayName":"加幣","GBP_displayName":"英鎊","JPY_displayName":"日圓","GBP_symbol":"GBP","AUD_displayName":"澳幣","EUR_symbol":"EUR","CNY_displayName":"人民幣","HKD_displayName":"港元","CHF_displayName":"瑞士法郎","HKD_symbol":"HK$","USD_displayName":"美元","CNY_symbol":"￥","USD_symbol":"US$","JPY_symbol":"JP¥"}) \ No newline at end of file +({"BRE_displayName":"巴西克魯賽羅 (1990-1993)","DEM_displayName":"德國馬克","KGS_symbol":"som","CUP_displayName":"古巴披索","HUF_symbol":"Ft","BDT_symbol":"Tk","LSL_symbol":"M","VEF_symbol":"BsF","MDL_displayName":"摩杜雲列伊","DOP_displayName":"多明尼加披索","MTL_symbol":"Lm","NGN_displayName":"奈及利亞奈拉","KZT_displayName":"卡扎克斯坦坦吉","BGL_symbol":"lev","LTT_displayName":"立陶宛特羅","LAK_displayName":"寮國基普","LKR_displayName":"斯里蘭卡盧布","AOR_displayName":"安哥拉新寬扎 Reajustado (1995-1999)","XEU_displayName":"歐洲貨幣單位 XEU","SYP_symbol":"LS","USS_displayName":"美元 (同一天)","MNT_displayName":"蒙古圖格里克","AMD_symbol":"dram","MOP_displayName":"澳門元","TJR_displayName":"塔吉克斯坦盧布","LUC_displayName":"盧森堡可兌換法郎","LUL_displayName":"盧森堡金融法郎","MRO_symbol":"UM","AON_displayName":"安哥拉新寬扎 (1990-2000)","BEF_displayName":"比利時法郎","IEP_displayName":"愛爾蘭鎊","SBD_displayName":"索羅門群島元","GRD_displayName":"希臘德拉克馬","AZM_displayName":"阿塞拜彊馬特納","MTP_displayName":"馬爾他鎊","UGX_symbol":"U Sh","ARS_symbol":"Arg$","LVR_displayName":"拉脫維亞盧布","GNF_displayName":"幾內亞法郎","GIP_displayName":"直布羅陀鎊","SRG_displayName":"蘇里南盾","BAD_displayName":"波士尼亞-黑塞哥維那第納爾","FJD_displayName":"斐濟元","BAM_displayName":"波士尼亞-黑塞哥維那可轉換馬克","XBB_displayName":"歐洲貨幣單位 XBB","CDF_displayName":"剛果法郎","HRD_displayName":"克羅地亞第納爾","EQE_displayName":"埃奎維勒","BZD_displayName":"伯利茲元","MLF_displayName":"馬里法郎","VEB_symbol":"Be","EGP_displayName":"埃及鎊","MVR_displayName":"馬爾地夫海島盧非亞","KWD_symbol":"KD","TRL_symbol":"TL","ALL_symbol":"lek","SDP_displayName":"蘇丹鎊","NPR_displayName":"尼泊爾盧布","PHP_displayName":"菲律賓披索","DJF_symbol":"DF","WST_displayName":"西薩摩亞塔拉","JPY_displayName":"日圓","TMM_displayName":"土庫曼馬納特","STD_symbol":"Db","BGN_displayName":"保加利亞新列弗","KYD_displayName":"開曼群島美元","VUV_displayName":"萬那杜萬杜","IRR_displayName":"伊朗里亞爾","DJF_displayName":"吉布地法郎","BTN_symbol":"Nu","XDR_displayName":"特殊提款權","ECS_displayName":"厄瓜多蘇克雷","LSM_displayName":"馬洛蒂","MNT_symbol":"Tug","NLG_displayName":"荷蘭盾","MWK_displayName":"馬拉維克瓦查","IRR_symbol":"RI","OMR_symbol":"RO","JMD_symbol":"J$","PES_displayName":"秘魯太陽幣","SRG_symbol":"Sf","LYD_displayName":"利比亞第納爾","BRR_displayName":"巴西克魯賽羅","ETB_symbol":"Br","KMF_symbol":"CF","DKK_symbol":"DKr","XXX_displayName":"XXX","IDR_displayName":"印尼 - 盧布","DZD_symbol":"DA","TZS_symbol":"T Sh","SGD_symbol":"SGD","KGS_displayName":"吉爾吉斯索馬","BRN_displayName":"巴西克如爾達農瓦","AFN_symbol":"Af","ISK_displayName":"冰島克朗","LUF_displayName":"盧森堡法郎","MXN_symbol":"MEX$","GYD_symbol":"G$","TOP_symbol":"T$","SVC_displayName":"薩爾瓦多科郎","ZMK_displayName":"尚比亞克瓦查","TOP_displayName":"東加潘加","ITL_displayName":"義大利里拉","USN_displayName":"美元 (第二天)","KWD_displayName":"科威特第納爾","GEL_symbol":"lari","KMF_displayName":"科摩羅法郎","COP_symbol":"Col$","MYR_displayName":"馬來西亞 - 林吉特","XFU_displayName":"法國 UIC 法郎","GMD_displayName":"甘比亞達拉西","LVL_displayName":"拉脫維亞拉特銀幣","AUD_displayName":"澳幣","XPF_displayName":"CFP 法郎","LBP_displayName":"黎巴嫩鎊","SKK_symbol":"Sk","BYB_displayName":"白俄羅斯新盧布 (1994-1999)","MKD_displayName":"馬其頓第納爾","GWP_displayName":"幾內亞披索披索","CNY_displayName":"人民幣","HNL_symbol":"L","BOB_symbol":"Bs","JOD_displayName":"約旦第納爾","OMR_displayName":"阿曼里奧","BOV_displayName":"玻利維亞幕多","XPT_displayName":"白金","AUD_symbol":"$A","NOK_displayName":"挪威克羅納","SCR_displayName":"塞舌爾群島盧布","XBA_displayName":"歐洲綜合單位","CSK_displayName":"捷克斯洛伐克硬克朗","PLZ_displayName":"波蘭茲羅提 (1950-1995)","UAK_displayName":"烏克蘭卡本瓦那茲","MGF_displayName":"馬達加斯加法郎","GNS_displayName":"幾內亞西里","YUN_displayName":"南斯拉夫 可轉換第納爾","UYU_symbol":"Ur$","GYD_displayName":"圭亞那元","QAR_displayName":"卡達爾里亞爾","BZD_symbol":"BZ$","JOD_symbol":"JD","ALL_displayName":"阿爾巴尼亞列克","BBD_displayName":"巴貝多元","RON_displayName":"羅馬尼亞列伊","XCD_symbol":"EC$","AMD_displayName":"亞美尼亞德拉姆","CYP_displayName":"賽浦路斯鎊","GBP_symbol":"GBP","SEK_displayName":"瑞典克羅納","MZN_symbol":"MTn","MMK_displayName":"緬甸元","ZAR_displayName":"南非蘭特","ECV_displayName":"厄瓜多爾由里達瓦康斯坦 (UVC)","LYD_symbol":"LD","VUV_symbol":"VT","AWG_displayName":"阿魯巴盾","CVE_symbol":"CVEsc","STD_displayName":"聖多美島和普林西比島多布拉","CAD_displayName":"加幣","ADP_displayName":"安道爾陪士特","MRO_displayName":"茅利塔尼亞烏吉亞","LSL_displayName":"賴索托羅蒂","TND_displayName":"突尼西亞第納爾","USD_symbol":"$","BMD_symbol":"Ber$","BAM_symbol":"KM","BRC_displayName":"巴西克魯賽羅 (1986-1989)","BMD_displayName":"百慕達幣","BRL_displayName":"巴西里拉","JMD_displayName":"牙買加元","SOS_displayName":"索馬利亞先令","SAR_displayName":"沙烏地里雅","PEI_displayName":"祕魯因蒂","ESP_displayName":"西班牙陪士特","HKD_displayName":"港幣","ESP_symbol":"₧","BWP_displayName":"波札那 - 普拉","TTD_displayName":"千里達及托巴哥元","BSD_displayName":"巴哈馬元","BIF_displayName":"蒲隆地法郎","FRF_displayName":"法國法郎","DKK_displayName":"丹麥克羅納","AED_displayName":"阿拉伯聯合大公國迪爾汗","GHS_symbol":"GH¢","AOK_displayName":"安哥拉寬扎(1977-1990)","ATS_displayName":"奧地利先令","PEN_displayName":"秘魯新太陽幣","CRC_displayName":"哥斯大黎加科郎","PAB_displayName":"巴拿馬巴波亞","CHE_displayName":"WIR 歐元","GQE_displayName":"赤道幾內亞埃奎勒","DZD_displayName":"阿爾及利亞第納爾","EEK_displayName":"愛沙尼亞克朗","YDD_displayName":"葉門第納爾","GHC_displayName":"迦納仙蔕","YER_symbol":"YRl","PLN_symbol":"Zl","NPR_symbol":"Nrs","MXP_displayName":"墨西哥銀披索 (1861-1992)","XAG_displayName":"XAG","XFO_displayName":"法國金法郎","GWE_displayName":"葡屬幾內亞埃斯庫多","BOB_displayName":"玻利維亞貨幣單位","CAD_symbol":"Can$","ZWD_displayName":"辛巴威元","SRD_displayName":"蘇利南元","ZRN_displayName":"薩伊新扎伊爾","XAU_displayName":"黃金","GTQ_symbol":"Q","KRW_symbol":"KRW","BOP_displayName":"玻利維亞披索","LBP_symbol":"LL","XBD_displayName":"歐洲會計單位(XBD)","TZS_displayName":"坦尚尼亞先令","XPF_symbol":"CFPF","TTD_symbol":"TT$","LRD_displayName":"賴比瑞亞元","KRW_displayName":"韓國圜","SHP_displayName":"聖赫勒拿鎊","NAD_symbol":"N$","MZE_displayName":"莫桑比克埃斯庫多","SDD_displayName":"蘇丹第納爾","HRK_displayName":"克羅地亞庫納","FKP_displayName":"福克蘭群島鎊","COP_displayName":"哥倫比亞披索","YUD_displayName":"南斯拉夫第納爾硬幣","YUM_displayName":"南斯拉夫挪威亞第納爾","BYR_symbol":"Rbl","THB_displayName":"泰銖","MGA_displayName":"馬達加斯加艾瑞爾","TWD_displayName":"新臺幣","UGS_displayName":"烏干達先令 (1966-1987)","SBD_symbol":"SI$","ZAL_displayName":"南非 - 蘭特 (金融)","GEL_displayName":"喬治拉里","ILP_displayName":"以色列鎊","MKD_symbol":"MDen","KES_displayName":"肯尼亞先令","CZK_displayName":"捷克克朗","UGX_displayName":"烏干達先令","KZT_symbol":"T","BGL_displayName":"保加利亞硬列弗","ARP_displayName":"阿根廷披索(1983-1985)","BBD_symbol":"BDS$","MYR_symbol":"RM","RUR_displayName":"俄羅斯盧布 (1991-1998)","ERN_displayName":"厄立特里亞納克法","BEF_symbol":"BF","CLF_displayName":"卡林油達佛曼跎","BRB_displayName":"巴西克魯薩多農瓦（1967-1986）","IDR_symbol":"Rp","IEP_symbol":"IR£","BHD_displayName":"巴林第納爾","SYP_displayName":"敘利亞鎊","BIF_symbol":"Fbu","SZL_displayName":"史瓦濟蘭里朗吉尼","INR_displayName":"印度盧布","PTE_displayName":"葡萄牙埃斯庫多","KPW_displayName":"北朝鮮幣","XOF_displayName":"西非法郎 BCEAO","DOP_symbol":"RD$","MXN_displayName":"墨西哥 - 披索","RWF_displayName":"盧安達法郎","ETB_displayName":"衣索比亞比爾","LTL_displayName":"立陶宛里塔","SZL_symbol":"E","QAR_symbol":"QR","SOS_symbol":"Sh.","BND_displayName":"汶萊元","SUR_displayName":"蘇聯盧布","AOA_displayName":"安哥拉寬扎","FJD_symbol":"F$","CVE_displayName":"維德角埃斯庫多","XTS_displayName":"XTS","CLP_displayName":"智利披索","HUF_displayName":"匈牙利 - 福林","LKR_symbol":"SL Re","SCR_symbol":"SR","TJS_displayName":"塔吉克索莫尼","MWK_symbol":"MK","GBP_displayName":"英鎊","TPE_displayName":"帝汶埃斯庫多","GNF_symbol":"GF","SGD_displayName":"新加坡幣","SLL_displayName":"獅子山利昂","MZM_symbol":"Mt","PHP_symbol":"Php","CYP_symbol":"£C","XAF_displayName":"西非法郎 BEAC","MTL_displayName":"馬爾他里拉","KHR_displayName":"柬埔寨瑞爾","ZRZ_displayName":"扎伊爾扎伊爾","KES_symbol":"K Sh","PKR_symbol":"Pra","IQD_symbol":"ID","BEC_displayName":"比利時法郎 （可轉換）","BEL_displayName":"比利時法郎 （金融）","AZN_displayName":"亞塞拜然蒙納特","FIM_displayName":"芬蘭馬克","PKR_displayName":"巴基斯坦盧布","UYP_displayName":"烏拉圭披索 (1975-1993)","ANG_symbol":"NA f.","CHW_displayName":"WIR 法郎","PLN_displayName":"波蘭茲羅提","RON_symbol":"0≤lei|1≤leu|1","BTN_displayName":"不丹那特倫","UAH_displayName":"烏克蘭格里夫那","YER_displayName":"也門里亞爾","UYU_displayName":"烏拉圭披索","CRC_symbol":"C","PGK_displayName":"巴布亞紐幾內亞基那","XBC_displayName":"歐洲會計單位(XBC)","EUR_displayName":"歐元","MUR_displayName":"模里西斯盧布","BYR_displayName":"白俄羅斯盧布","SEK_symbol":"SKr","BHD_symbol":"BD","IQD_displayName":"伊拉克第納爾","VEB_displayName":"委內瑞拉博利瓦","CLP_symbol":"Ch$","MZM_displayName":"莫三比克梅蒂卡爾","NZD_symbol":"$NZ","CHF_symbol":"SwF","SIT_displayName":"斯洛維尼亞托勒","NOK_symbol":"NKr","XCD_displayName":"格瑞那達元","RUB_displayName":"俄羅斯盧布","BUK_displayName":"緬甸元 BUK","ILS_displayName":"以色列新謝克爾","KHR_symbol":"CR","NAD_displayName":"納米比亞元","HNL_displayName":"洪都拉斯倫皮拉","GTQ_displayName":"瓜地馬拉格查爾","EUR_symbol":"EUR","NZD_displayName":"紐西蘭幣","ARA_displayName":"阿根廷奧斯特納爾","ARS_displayName":"阿根廷披索","ANG_displayName":"荷屬安地列斯盾","MOP_symbol":"MOP","ZWD_symbol":"Z$","ITL_symbol":"₤","ZAR_symbol":"R","CHF_displayName":"瑞士法郎","HKD_symbol":"HK$","USD_displayName":"美元","CNY_symbol":"￥","JPY_symbol":"JP¥"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/zh-tw/gregorian.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/zh-tw/gregorian.js index 90e37764..4e84a43f 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/zh-tw/gregorian.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/zh-tw/gregorian.js @@ -1 +1 @@ -({"quarters-format-abbreviated":["1季","2季","3季","4季"],"dateFormat-medium":"yyyy/M/d","field-second":"秒","field-week":"週","timeFormat-full":"ahh時mm分ss秒 v","dateTimeAvailableFormats":"M/d","eraNames":["西元前","西元"],"field-minute":"分鐘","timeFormat-medium":"a h:mm:ss","field-hour":"小時","dateFormat-short":"yyyy/M/d","field-era":"年代","timeFormat-short":"a h:mm","timeFormat-long":"ahh時mm分ss秒 z","quarters-format-wide":["第1季","第2季","第3季","第4季"],"quarters-stand-alone-abbreviated":["1季","2季","3季","4季"],"field-weekday":"週天","field-zone":"區域","days-format-abbr":["週日","週一","週二","週三","週四","週五","週六"],"pm":"下午","months-standAlone-narrow":["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],"months-standAlone-wide":["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],"am":"上午","days-standAlone-narrow":["日","一","二","三","四","五","六"],"field-year":"年","months-standAlone-abbr":["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],"dateFormat-long":"yyyy年M月d日","field-day":"日","field-dayperiod":"上午/下午","field-month":"月","months-format-wide":["1","2","3","4","5","6","7","8","9","10","11","12"],"days-format-wide":["星期日","星期一","星期二","星期三","星期四","星期五","星期六"],"eraAbbr":["公元前","公元"],"dateFormat-full":"yyyy年M月d日EEEE","dateTimeFormats-appendItem-Second":"{0} ({2}: {1})","dateTimeFormats-appendItem-Year":"{0} {1}","dateTimeFormats-appendItem-Week":"{0} ({2}: {1})","dateTimeFormats-appendItem-Timezone":"{0} {1}","dateTimeFormats-appendItem-Month":"{0} ({2}: {1})","dateTimeFormats-appendItem-Minute":"{0} ({2}: {1})","dateTimeFormat":"{1} {0}","dateTimeFormats-appendItem-Day":"{0} ({2}: {1})","months-format-abbr":["1","2","3","4","5","6","7","8","9","10","11","12"],"dateTimeFormats-appendItem-Quarter":"{0} ({2}: {1})","dateTimeFormats-appendItem-Day-Of-Week":"{0} {1}","dateTimeFormats-appendItem-Hour":"{0} ({2}: {1})","quarters-stand-alone-narrow":["1","2","3","4"],"dateTimeFormats-appendItem-Era":"{0} {1}","eraNarrow":["BCE","CE"]}) \ No newline at end of file +({"quarters-standAlone-wide":["第1季","第2季","第3季","第4季"],"quarters-format-abbr":["第1季","第2季","第3季","第4季"],"dateFormat-medium":"yyyy/M/d","field-second":"秒","quarters-standAlone-abbr":["第1季","第2季","第3季","第4季"],"field-week":"週","timeFormat-full":"ahh時mm分ss秒v","dateTimeAvailableFormats":["d日（E）","H:mm","H:mm:ss","M-d（E）","MM/dd","M/d","yyyy/M","yyyy/M/d（EEE）","yyyy年M月","yyyy年M月","yyyy/MM","MMMMdd日","MMMd日","MM-dd","M-d","d日","mm:ss","mm:ss","yyyy年","yyyy-M","yyyy年M月d日，E","yyyy年MMM","yyyy年MMMd日EEE","yyyy年MMMM","yyyy年QQQ","y年QQQ","yy-MM","yy年MMM","yy年第Q季度","yyyy年","yyyy年M月","yyyy年MMMM"],"months-standAlone-narrow":["1","2","3","4","5","6","7","8","9","10","11","12"],"months-standAlone-wide":["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],"eraNames":["西元前","西元"],"months-standAlone-abbr":["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],"field-minute":"分鐘","timeFormat-medium":"ah:mm:ss","field-hour":"小時","dateFormat-short":"yyyy/M/d","field-era":"年代","days-standAlone-abbr":["週日","週一","週二","週三","週四","週五","週六"],"timeFormat-long":"ahh時mm分ss秒z","quarters-format-wide":["第1季","第2季","第3季","第4季"],"field-weekday":"週天","days-format-abbr":["週日","週一","週二","週三","週四","週五","週六"],"field-zone":"區域","field-dayperiod":"上午/下午","days-standAlone-wide":["星期日","星期一","星期二","星期三","星期四","星期五","星期六"],"days-standAlone-narrow":["日","一","二","三","四","五","六"],"eraAbbr":["公元前","公元"],"dateFormat-long":"yyyy年M月d日","dateTimeFormat":"{1} {0}","field-year":"年","quarters-standAlone-narrow":["1","2","3","4"],"months-format-abbr":["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],"timeFormat-short":"ah:mm","field-month":"月","pm":"下午","days-format-narrow":["日","一","二","三","四","五","六"],"field-day":"日","months-format-narrow":["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],"am":"上午","dateFormat-full":"yyyy年M月d日EEEE","months-format-wide":["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],"days-format-wide":["星期日","星期一","星期二","星期三","星期四","星期五","星期六"],"eraNarrow":["公元前","公元"],"dateTimeFormats-appendItem-Second":"{0} ({2}: {1})","dateTimeFormats-appendItem-Year":"{0} {1}","dateTimeFormats-appendItem-Week":"{0} ({2}: {1})","dateTimeFormats-appendItem-Timezone":"{0} {1}","dateTimeFormats-appendItem-Month":"{0} ({2}: {1})","dateTimeFormats-appendItem-Minute":"{0} ({2}: {1})","dateTimeFormats-appendItem-Day":"{0} ({2}: {1})","quarters-format-narrow":["1","2","3","4"],"dateTimeFormats-appendItem-Quarter":"{0} ({2}: {1})","dateTimeFormats-appendItem-Day-Of-Week":"{0} {1}","dateTimeFormats-appendItem-Hour":"{0} ({2}: {1})","dateTimeFormats-appendItem-Era":"{0} {1}"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/zh-tw/number.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/zh-tw/number.js index 517085a8..dc51043c 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/zh-tw/number.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/zh-tw/number.js @@ -1 +1 @@ -({"currencyFormat": "¤#,##0.00", "scientificFormat": "#E0", "currencySpacing-afterCurrency-currencyMatch": "[:letter:]", "infinity": "∞", "list": ";", "percentSign": "%", "minusSign": "-", "currencySpacing-beforeCurrency-surroundingMatch": "[:digit:]", "currencySpacing-afterCurrency-insertBetween": " ", "nan": "NaN", "nativeZeroDigit": "0", "plusSign": "+", "currencySpacing-afterCurrency-surroundingMatch": "[:digit:]", "currencySpacing-beforeCurrency-currencyMatch": "[:letter:]", "perMille": "‰", "group": ",", "percentFormat": "#,##0%", "decimalFormat": "#,##0.###", "decimal": ".", "patternDigit": "#", "currencySpacing-beforeCurrency-insertBetween": " ", "exponential": "E"}) \ No newline at end of file +({"currencyFormat":"¤#,##0.00","group":",","list":";","decimalFormat":"#,##0.###","scientificFormat":"#E0","percentFormat":"#,##0%","decimal":".","currencySpacing-afterCurrency-currencyMatch":"[:letter:]","infinity":"∞","percentSign":"%","minusSign":"-","currencySpacing-beforeCurrency-surroundingMatch":"[:digit:]","currencySpacing-afterCurrency-insertBetween":" ","nan":"NaN","nativeZeroDigit":"0","plusSign":"+","currencySpacing-afterCurrency-surroundingMatch":"[:digit:]","currencySpacing-beforeCurrency-currencyMatch":"[:letter:]","perMille":"‰","patternDigit":"#","currencySpacing-beforeCurrency-insertBetween":" ","exponential":"E"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/zh/currency.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/zh/currency.js index 58a97b50..50efc23d 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/zh/currency.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/zh/currency.js @@ -1 +1 @@ -({"HKD_displayName": "港元", "CHF_displayName": "瑞士法郎", "JPY_symbol": "JP¥", "HKD_symbol": "HK$", "CAD_displayName": "加拿大元", "USD_symbol": "US$", "AUD_displayName": "澳大利亚元", "JPY_displayName": "日元", "USD_displayName": "美元", "GBP_displayName": "英磅", "EUR_displayName": "欧元", "GBP_symbol": "£", "EUR_symbol": "€"}) \ No newline at end of file +({"HKD_displayName":"港元","CHF_displayName":"瑞士法郎","HKD_symbol":"HK$","CAD_displayName":"加拿大元","CNY_displayName":"人民币","AUD_displayName":"澳大利亚元","JPY_displayName":"日元","USD_displayName":"美元","CNY_symbol":"￥","GBP_displayName":"英镑","EUR_displayName":"欧元","USD_symbol":"US$","GBP_symbol":"UK£","JPY_symbol":"JP¥","EUR_symbol":"€"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/zh/gregorian.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/zh/gregorian.js index b3e06569..b3c79e9c 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/zh/gregorian.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/zh/gregorian.js @@ -1 +1 @@ -({"eraAbbr": ["公元前", "公元"], "am": "上午", "months-format-abbr": ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"], "days-format-abbr": ["周日", "周一", "周二", "周三", "周四", "周五", "周六"], "pm": "下午", "months-format-wide": ["一月", "二月", "三月", "四月", "五月", "六月", "七月", "八月", "九月", "十月", "十一月", "十二月"], "months-standAlone-narrow": ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"], "days-standAlone-narrow": ["日", "一", "二", "三", "四", "五", "六"], "days-format-wide": ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"], "dateTimeFormats-appendItem-Second": "{0} ({2}: {1})", "field-dayperiod": "Dayperiod", "field-minute": "Minute", "eraNames": ["BCE", "CE"], "field-weekday": "Day of the Week", "dateTimeFormats-appendItem-Year": "{0} {1}", "field-era": "Era", "field-hour": "Hour", "timeFormat-full": "HH:mm:ss z", "dateTimeFormats-appendItem-Week": "{0} ({2}: {1})", "dateTimeFormats-appendItem-Timezone": "{0} {1}", "dateTimeFormats-appendItem-Month": "{0} ({2}: {1})", "dateFormat-long": "yyyy MMMM d", "timeFormat-medium": "HH:mm:ss", "field-zone": "Zone", "dateTimeFormats-appendItem-Minute": "{0} ({2}: {1})", "dateFormat-medium": "yyyy MMM d", "quarters-format-abbreviated": ["Q1", "Q2", "Q3", "Q4"], "dateTimeFormat": "{1} {0}", "field-year": "Year", "dateTimeFormats-appendItem-Day": "{0} ({2}: {1})", "field-week": "Week", "timeFormat-long": "HH:mm:ss z", "timeFormat-short": "HH:mm", "field-month": "Month", "dateTimeFormats-appendItem-Quarter": "{0} ({2}: {1})", "field-second": "Second", "field-day": "Day", "dateTimeFormats-appendItem-Day-Of-Week": "{0} {1}", "dateTimeFormats-appendItem-Hour": "{0} ({2}: {1})", "dateFormat-short": "yy/MM/dd", "dateFormat-full": "EEEE, yyyy MMMM dd", "dateTimeFormats-appendItem-Era": "{0} {1}", "quarters-format-wide": ["Q1", "Q2", "Q3", "Q4"]}) \ No newline at end of file +({"field-dayperiod":"上午/下午","field-minute":"分钟","eraNames":["公元前","公元"],"field-weekday":"周天","days-standAlone-wide":["星期日","星期一","星期二","星期三","星期四","星期五","星期六"],"months-standAlone-narrow":["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],"field-era":"时期","field-hour":"小时","quarters-standAlone-abbr":["1季","2季","3季","4季"],"timeFormat-full":"ahh时mm分ss秒v","months-standAlone-abbr":["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],"days-standAlone-narrow":["日","一","二","三","四","五","六"],"eraAbbr":["公元前","公元"],"dateFormat-long":"yyyy年M月d日","timeFormat-medium":"ahh:mm:ss","field-zone":"区域","dateFormat-medium":"yyyy-M-d","quarters-standAlone-wide":["第1季度","第2季度","第3季度","第4季度"],"dateTimeFormat":"{1} {0}","field-year":"年","quarters-standAlone-narrow":["1","2","3","4"],"months-standAlone-wide":["一月","二月","三月","四月","五月","六月","七月","八月","九月","十月","十一月","十二月"],"field-week":"周","timeFormat-long":"ahh时mm分ss秒z","months-format-abbr":["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],"timeFormat-short":"ah:mm","field-month":"月","quarters-format-abbr":["1季","2季","3季","4季"],"days-format-abbr":["周日","周一","周二","周三","周四","周五","周六"],"pm":"下午","days-format-narrow":["日","一","二","三","四","五","六"],"field-second":"秒钟","field-day":"日","months-format-narrow":["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],"am":"上午","days-standAlone-abbr":["周日","周一","周二","周三","周四","周五","周六"],"dateFormat-short":"yy-M-d","dateFormat-full":"yyyy年M月d日EEEE","months-format-wide":["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],"dateTimeAvailableFormats":["d日E","H时","HH:mm","HH:mm:ss","H:mm","L","M-dE","LLL","MMMd日E","MMMMd日E","MMMMd日","MMMMdd日","MMMd日","MM-dd","M-d","d日","mm:ss","mm:ss","yyyy年","yyyy-M","yyyy年M月d日，E","yyyy年MMM","yyyy年MMMd日EEE","yyyy年MMMM","yyyy年QQQ","y年QQQ","yy-MM","yy年MMM","yy年第Q季度","yyyy年","yyyy年M月","yyyy年MMMM"],"quarters-format-wide":["第1季度","第2季度","第3季度","第4季度"],"days-format-wide":["星期日","星期一","星期二","星期三","星期四","星期五","星期六"],"eraNarrow":["公元前","公元"],"dateTimeFormats-appendItem-Second":"{0} ({2}: {1})","dateTimeFormats-appendItem-Year":"{0} {1}","dateTimeFormats-appendItem-Week":"{0} ({2}: {1})","dateTimeFormats-appendItem-Timezone":"{0} {1}","dateTimeFormats-appendItem-Month":"{0} ({2}: {1})","dateTimeFormats-appendItem-Minute":"{0} ({2}: {1})","dateTimeFormats-appendItem-Day":"{0} ({2}: {1})","quarters-format-narrow":["1","2","3","4"],"dateTimeFormats-appendItem-Quarter":"{0} ({2}: {1})","dateTimeFormats-appendItem-Day-Of-Week":"{0} {1}","dateTimeFormats-appendItem-Hour":"{0} ({2}: {1})","dateTimeFormats-appendItem-Era":"{0} {1}"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/zh/number.js b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/zh/number.js index a2232796..90d87b94 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/nls/zh/number.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/nls/zh/number.js @@ -1 +1 @@ -({"currencyFormat":"¤#,##0.00","group":",","decimal":".","scientificFormat":"#E0","currencySpacing-afterCurrency-currencyMatch":"[:letter:]","infinity":"∞","list":";","percentSign":"%","minusSign":"-","currencySpacing-beforeCurrency-surroundingMatch":"[:digit:]","currencySpacing-afterCurrency-insertBetween":" ","nan":"NaN","nativeZeroDigit":"0","plusSign":"+","currencySpacing-afterCurrency-surroundingMatch":"[:digit:]","currencySpacing-beforeCurrency-currencyMatch":"[:letter:]","perMille":"‰","percentFormat":"#,##0%","decimalFormat":"#,##0.###","patternDigit":"#","currencySpacing-beforeCurrency-insertBetween":" ","exponential":"E"}) \ No newline at end of file +({"decimalFormat":"#,##0.###","group":",","scientificFormat":"#E0","percentFormat":"#,##0%","currencyFormat":"¤#,##0.00","decimal":".","currencySpacing-afterCurrency-currencyMatch":"[:letter:]","infinity":"∞","list":";","percentSign":"%","minusSign":"-","currencySpacing-beforeCurrency-surroundingMatch":"[:digit:]","currencySpacing-afterCurrency-insertBetween":" ","nan":"NaN","nativeZeroDigit":"0","plusSign":"+","currencySpacing-afterCurrency-surroundingMatch":"[:digit:]","currencySpacing-beforeCurrency-currencyMatch":"[:letter:]","perMille":"‰","patternDigit":"#","currencySpacing-beforeCurrency-insertBetween":" ","exponential":"E"}) \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/cldr/supplemental.js b/spring-js/src/main/resources/META-INF/dojo/cldr/supplemental.js index b4aa0cbe..2c63501d 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cldr/supplemental.js +++ b/spring-js/src/main/resources/META-INF/dojo/cldr/supplemental.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo.cldr.supplemental"]){dojo._hasResource["dojo.cldr.supplemental"]=true;dojo.provide("dojo.cldr.supplemental");dojo.require("dojo.i18n");dojo.cldr.supplemental.getFirstDayOfWeek=function(_1){var _2={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};var _3=dojo.cldr.supplemental._region(_1);var _4=_2[_3];return (typeof _4=="undefined")?1:_4;};dojo.cldr.supplemental._region=function(_5){_5=dojo.i18n.normalizeLocale(_5);var _6=_5.split("-");var _7=_6[1];if(!_7){_7={de:"de",en:"us",es:"es",fi:"fi",fr:"fr",hu:"hu",it:"it",ja:"jp",ko:"kr",nl:"nl",pt:"br",sv:"se",zh:"cn"}[_6[0]];}else{if(_7.length==4){_7=_6[2];}}return _7;};dojo.cldr.supplemental.getWeekend=function(_8){var _9={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 _a={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};var _b=dojo.cldr.supplemental._region(_8);var _c=_9[_b];var _d=_a[_b];if(typeof _c=="undefined"){_c=6;}if(typeof _d=="undefined"){_d=0;}return {start:_c,end:_d};};} \ No newline at end of file +if(!dojo._hasResource["dojo.cldr.supplemental"]){dojo._hasResource["dojo.cldr.supplemental"]=true;dojo.provide("dojo.cldr.supplemental");dojo.require("dojo.i18n");dojo.cldr.supplemental.getFirstDayOfWeek=function(_1){var _2={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,sy:4};var _3=dojo.cldr.supplemental._region(_1);var _4=_2[_3];return (_4===undefined)?1:_4;};dojo.cldr.supplemental._region=function(_5){_5=dojo.i18n.normalizeLocale(_5);var _6=_5.split("-");var _7=_6[1];if(!_7){_7={de:"de",en:"us",es:"es",fi:"fi",fr:"fr",he:"il",hu:"hu",it:"it",ja:"jp",ko:"kr",nl:"nl",pt:"br",sv:"se",zh:"cn"}[_6[0]];}else{if(_7.length==4){_7=_6[2];}}return _7;};dojo.cldr.supplemental.getWeekend=function(_8){var _9={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 _a={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};var _b=dojo.cldr.supplemental._region(_8);var _c=_9[_b];var _d=_a[_b];if(_c===undefined){_c=6;}if(_d===undefined){_d=0;}return {start:_c,end:_d};};} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/colors.js b/spring-js/src/main/resources/META-INF/dojo/colors.js index d242077b..fae7adc2 100644 --- a/spring-js/src/main/resources/META-INF/dojo/colors.js +++ b/spring-js/src/main/resources/META-INF/dojo/colors.js @@ -1,11 +1,7 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ diff --git a/spring-js/src/main/resources/META-INF/dojo/cookie.js b/spring-js/src/main/resources/META-INF/dojo/cookie.js index 4a844402..353e4cb4 100644 --- a/spring-js/src/main/resources/META-INF/dojo/cookie.js +++ b/spring-js/src/main/resources/META-INF/dojo/cookie.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo.cookie"]){dojo._hasResource["dojo.cookie"]=true;dojo.provide("dojo.cookie");dojo.cookie=function(_1,_2,_3){var c=document.cookie;if(arguments.length==1){var _5=c.lastIndexOf(_1+"=");if(_5==-1){return null;}var _6=_5+_1.length+1;var _7=c.indexOf(";",_5+_1.length+1);if(_7==-1){_7=c.length;}return decodeURIComponent(c.substring(_6,_7));}else{_3=_3||{};_2=encodeURIComponent(_2);if(typeof (_3.expires)=="number"){var d=new Date();d.setTime(d.getTime()+(_3.expires*24*60*60*1000));_3.expires=d;}document.cookie=_1+"="+_2+(_3.expires?"; expires="+_3.expires.toUTCString():"")+(_3.path?"; path="+_3.path:"")+(_3.domain?"; domain="+_3.domain:"")+(_3.secure?"; secure":"");return null;}};} \ No newline at end of file +if(!dojo._hasResource["dojo.cookie"]){dojo._hasResource["dojo.cookie"]=true;dojo.provide("dojo.cookie");dojo.require("dojo.regexp");dojo.cookie=function(_1,_2,_3){var c=document.cookie;if(arguments.length==1){var _5=c.match(new RegExp("(?:^|; )"+dojo.regexp.escapeString(_1)+"=([^;]*)"));return _5?decodeURIComponent(_5[1]):undefined;}else{_3=_3||{};var _6=_3.expires;if(typeof _6=="number"){var d=new Date();d.setTime(d.getTime()+_6*24*60*60*1000);_6=_3.expires=d;}if(_6&&_6.toUTCString){_3.expires=_6.toUTCString();}_2=encodeURIComponent(_2);var _8=_1+"="+_2,_9;for(_9 in _3){_8+="; "+_9;var _a=_3[_9];if(_a!==true){_8+="="+_a;}}document.cookie=_8;}};dojo.cookie.isSupported=function(){if(!("cookieEnabled" in navigator)){this("__djCookieTest__","CookiesAllowed");navigator.cookieEnabled=this("__djCookieTest__")=="CookiesAllowed";if(navigator.cookieEnabled){this("__djCookieTest__","",{expires:-1});}}return navigator.cookieEnabled;};} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/currency.js b/spring-js/src/main/resources/META-INF/dojo/currency.js index 17cabeca..47160fe4 100644 --- a/spring-js/src/main/resources/META-INF/dojo/currency.js +++ b/spring-js/src/main/resources/META-INF/dojo/currency.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo.currency"]){dojo._hasResource["dojo.currency"]=true;dojo.provide("dojo.currency");dojo.require("dojo.number");dojo.require("dojo.i18n");dojo.requireLocalization("dojo.cldr","currency",null,"ROOT,de,en,en-au,en-ca,en-us,es,fr,it,ja,ko,pt,zh");dojo.require("dojo.cldr.monetary");dojo.currency._mixInDefaults=function(_1){_1=_1||{};_1.type="currency";var _2=dojo.i18n.getLocalization("dojo.cldr","currency",_1.locale)||{};var _3=_1.currency;var _4=dojo.cldr.monetary.getData(_3);dojo.forEach(["displayName","symbol","group","decimal"],function(_5){_4[_5]=_2[_3+"_"+_5];});_4.fractional=[true,false];return dojo.mixin(_4,_1);};dojo.currency.format=function(_6,_7){return dojo.number.format(_6,dojo.currency._mixInDefaults(_7));};dojo.currency.regexp=function(_8){return dojo.number.regexp(dojo.currency._mixInDefaults(_8));};dojo.currency.parse=function(_9,_a){return dojo.number.parse(_9,dojo.currency._mixInDefaults(_a));};} \ No newline at end of file +if(!dojo._hasResource["dojo.currency"]){dojo._hasResource["dojo.currency"]=true;dojo.provide("dojo.currency");dojo.require("dojo.number");dojo.require("dojo.i18n");dojo.requireLocalization("dojo.cldr","currency",null,"ROOT,de,en,en-au,en-ca,en-us,es,fr,it,ja,ko,pt,zh,zh-tw");dojo.require("dojo.cldr.monetary");dojo.currency._mixInDefaults=function(_1){_1=_1||{};_1.type="currency";var _2=dojo.i18n.getLocalization("dojo.cldr","currency",_1.locale)||{};var _3=_1.currency;var _4=dojo.cldr.monetary.getData(_3);dojo.forEach(["displayName","symbol","group","decimal"],function(_5){_4[_5]=_2[_3+"_"+_5];});_4.fractional=[true,false];return dojo.mixin(_4,_1);};dojo.currency.format=function(_6,_7){return dojo.number.format(_6,dojo.currency._mixInDefaults(_7));};dojo.currency.regexp=function(_8){return dojo.number.regexp(dojo.currency._mixInDefaults(_8));};dojo.currency.parse=function(_9,_a){return dojo.number.parse(_9,dojo.currency._mixInDefaults(_a));};} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/data/ItemFileReadStore.js b/spring-js/src/main/resources/META-INF/dojo/data/ItemFileReadStore.js index 66983ac2..71e41889 100644 --- a/spring-js/src/main/resources/META-INF/dojo/data/ItemFileReadStore.js +++ b/spring-js/src/main/resources/META-INF/dojo/data/ItemFileReadStore.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo.data.ItemFileReadStore"]){dojo._hasResource["dojo.data.ItemFileReadStore"]=true;dojo.provide("dojo.data.ItemFileReadStore");dojo.require("dojo.data.util.filter");dojo.require("dojo.data.util.simpleFetch");dojo.require("dojo.date.stamp");dojo.declare("dojo.data.ItemFileReadStore",null,{constructor:function(_1){this._arrayOfAllItems=[];this._arrayOfTopLevelItems=[];this._loadFinished=false;this._jsonFileUrl=_1.url;this._jsonData=_1.data;this._datatypeMap=_1.typeMap||{};if(!this._datatypeMap["Date"]){this._datatypeMap["Date"]={type:Date,deserialize:function(_2){return dojo.date.stamp.fromISOString(_2);}};}this._features={"dojo.data.api.Read":true,"dojo.data.api.Identity":true};this._itemsByIdentity=null;this._storeRefPropName="_S";this._itemNumPropName="_0";this._rootItemPropName="_RI";this._loadInProgress=false;this._queuedFetches=[];},url:"",_assertIsItem:function(_3){if(!this.isItem(_3)){throw new Error("dojo.data.ItemFileReadStore: Invalid item argument.");}},_assertIsAttribute:function(_4){if(typeof _4!=="string"){throw new Error("dojo.data.ItemFileReadStore: Invalid attribute argument.");}},getValue:function(_5,_6,_7){var _8=this.getValues(_5,_6);return (_8.length>0)?_8[0]:_7;},getValues:function(_9,_a){this._assertIsItem(_9);this._assertIsAttribute(_a);return _9[_a]||[];},getAttributes:function(_b){this._assertIsItem(_b);var _c=[];for(var _d in _b){if((_d!==this._storeRefPropName)&&(_d!==this._itemNumPropName)&&(_d!==this._rootItemPropName)){_c.push(_d);}}return _c;},hasAttribute:function(_e,_f){return this.getValues(_e,_f).length>0;},containsValue:function(_10,_11,_12){var _13=undefined;if(typeof _12==="string"){_13=dojo.data.util.filter.patternToRegExp(_12,false);}return this._containsValue(_10,_11,_12,_13);},_containsValue:function(_14,_15,_16,_17){return dojo.some(this.getValues(_14,_15),function(_18){if(_18!==null&&!dojo.isObject(_18)&&_17){if(_18.toString().match(_17)){return true;}}else{if(_16===_18){return true;}}});},isItem:function(_19){if(_19&&_19[this._storeRefPropName]===this){if(this._arrayOfAllItems[_19[this._itemNumPropName]]===_19){return true;}}return false;},isItemLoaded:function(_1a){return this.isItem(_1a);},loadItem:function(_1b){this._assertIsItem(_1b.item);},getFeatures:function(){return this._features;},getLabel:function(_1c){if(this._labelAttr&&this.isItem(_1c)){return this.getValue(_1c,this._labelAttr);}return undefined;},getLabelAttributes:function(_1d){if(this._labelAttr){return [this._labelAttr];}return null;},_fetchItems:function(_1e,_1f,_20){var _21=this;var _22=function(_23,_24){var _25=[];if(_23.query){var _26=_23.queryOptions?_23.queryOptions.ignoreCase:false;var _27={};for(var key in _23.query){var _29=_23.query[key];if(typeof _29==="string"){_27[key]=dojo.data.util.filter.patternToRegExp(_29,_26);}}for(var i=0;i<_24.length;++i){var _2b=true;var _2c=_24[i];if(_2c===null){_2b=false;}else{for(var key in _23.query){var _29=_23.query[key];if(!_21._containsValue(_2c,key,_29,_27[key])){_2b=false;}}}if(_2b){_25.push(_2c);}}_1f(_25,_23);}else{for(var i=0;i<_24.length;++i){var _2d=_24[i];if(_2d!==null){_25.push(_2d);}}_1f(_25,_23);}};if(this._loadFinished){_22(_1e,this._getItemsArray(_1e.queryOptions));}else{if(this._jsonFileUrl){if(this._loadInProgress){this._queuedFetches.push({args:_1e,filter:_22});}else{this._loadInProgress=true;var _2e={url:_21._jsonFileUrl,handleAs:"json-comment-optional"};var _2f=dojo.xhrGet(_2e);_2f.addCallback(function(_30){try{_21._getItemsFromLoadedData(_30);_21._loadFinished=true;_21._loadInProgress=false;_22(_1e,_21._getItemsArray(_1e.queryOptions));_21._handleQueuedFetches();}catch(e){_21._loadFinished=true;_21._loadInProgress=false;_20(e,_1e);}});_2f.addErrback(function(_31){_21._loadInProgress=false;_20(_31,_1e);});}}else{if(this._jsonData){try{this._loadFinished=true;this._getItemsFromLoadedData(this._jsonData);this._jsonData=null;_22(_1e,this._getItemsArray(_1e.queryOptions));}catch(e){_20(e,_1e);}}else{_20(new Error("dojo.data.ItemFileReadStore: No JSON source data was provided as either URL or a nested Javascript object."),_1e);}}}},_handleQueuedFetches:function(){if(this._queuedFetches.length>0){for(var i=0;i0)?_8[0]:_7;},getValues:function(_9,_a){this._assertIsItem(_9);this._assertIsAttribute(_a);return _9[_a]||[];},getAttributes:function(_b){this._assertIsItem(_b);var _c=[];for(var _d in _b){if((_d!==this._storeRefPropName)&&(_d!==this._itemNumPropName)&&(_d!==this._rootItemPropName)&&(_d!==this._reverseRefMap)){_c.push(_d);}}return _c;},hasAttribute:function(_e,_f){return this.getValues(_e,_f).length>0;},containsValue:function(_10,_11,_12){var _13=undefined;if(typeof _12==="string"){_13=dojo.data.util.filter.patternToRegExp(_12,false);}return this._containsValue(_10,_11,_12,_13);},_containsValue:function(_14,_15,_16,_17){return dojo.some(this.getValues(_14,_15),function(_18){if(_18!==null&&!dojo.isObject(_18)&&_17){if(_18.toString().match(_17)){return true;}}else{if(_16===_18){return true;}}});},isItem:function(_19){if(_19&&_19[this._storeRefPropName]===this){if(this._arrayOfAllItems[_19[this._itemNumPropName]]===_19){return true;}}return false;},isItemLoaded:function(_1a){return this.isItem(_1a);},loadItem:function(_1b){this._assertIsItem(_1b.item);},getFeatures:function(){return this._features;},getLabel:function(_1c){if(this._labelAttr&&this.isItem(_1c)){return this.getValue(_1c,this._labelAttr);}return undefined;},getLabelAttributes:function(_1d){if(this._labelAttr){return [this._labelAttr];}return null;},_fetchItems:function(_1e,_1f,_20){var _21=this;var _22=function(_23,_24){var _25=[];if(_23.query){var _26=_23.queryOptions?_23.queryOptions.ignoreCase:false;var _27={};for(var key in _23.query){var _29=_23.query[key];if(typeof _29==="string"){_27[key]=dojo.data.util.filter.patternToRegExp(_29,_26);}}for(var i=0;i<_24.length;++i){var _2b=true;var _2c=_24[i];if(_2c===null){_2b=false;}else{for(var key in _23.query){var _29=_23.query[key];if(!_21._containsValue(_2c,key,_29,_27[key])){_2b=false;}}}if(_2b){_25.push(_2c);}}_1f(_25,_23);}else{for(var i=0;i<_24.length;++i){var _2d=_24[i];if(_2d!==null){_25.push(_2d);}}_1f(_25,_23);}};if(this._loadFinished){_22(_1e,this._getItemsArray(_1e.queryOptions));}else{if(this._jsonFileUrl){if(this._loadInProgress){this._queuedFetches.push({args:_1e,filter:_22});}else{this._loadInProgress=true;var _2e={url:_21._jsonFileUrl,handleAs:"json-comment-optional",preventCache:this.urlPreventCache};var _2f=dojo.xhrGet(_2e);_2f.addCallback(function(_30){try{_21._getItemsFromLoadedData(_30);_21._loadFinished=true;_21._loadInProgress=false;_22(_1e,_21._getItemsArray(_1e.queryOptions));_21._handleQueuedFetches();}catch(e){_21._loadFinished=true;_21._loadInProgress=false;_20(e,_1e);}});_2f.addErrback(function(_31){_21._loadInProgress=false;_20(_31,_1e);});}}else{if(this._jsonData){try{this._loadFinished=true;this._getItemsFromLoadedData(this._jsonData);this._jsonData=null;_22(_1e,this._getItemsArray(_1e.queryOptions));}catch(e){_20(e,_1e);}}else{_20(new Error("dojo.data.ItemFileReadStore: No JSON source data was provided as either URL or a nested Javascript object."),_1e);}}}},_handleQueuedFetches:function(){if(this._queuedFetches.length>0){for(var i=0;i= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo.data.ItemFileWriteStore"]){dojo._hasResource["dojo.data.ItemFileWriteStore"]=true;dojo.provide("dojo.data.ItemFileWriteStore");dojo.require("dojo.data.ItemFileReadStore");dojo.declare("dojo.data.ItemFileWriteStore",dojo.data.ItemFileReadStore,{constructor:function(_1){this._features["dojo.data.api.Write"]=true;this._features["dojo.data.api.Notification"]=true;this._pending={_newItems:{},_modifiedItems:{},_deletedItems:{}};if(!this._datatypeMap["Date"].serialize){this._datatypeMap["Date"].serialize=function(_2){return dojo.date.stamp.toISOString(_2,{zulu:true});};}this._saveInProgress=false;},_assert:function(_3){if(!_3){throw new Error("assertion failed in ItemFileWriteStore");}},_getIdentifierAttribute:function(){var _4=this.getFeatures()["dojo.data.api.Identity"];return _4;},newItem:function(_5,_6){this._assert(!this._saveInProgress);if(!this._loadFinished){this._forceLoad();}if(typeof _5!="object"&&typeof _5!="undefined"){throw new Error("newItem() was passed something other than an object");}var _7=null;var _8=this._getIdentifierAttribute();if(_8===Number){_7=this._arrayOfAllItems.length;}else{_7=_5[_8];if(typeof _7==="undefined"){throw new Error("newItem() was not passed an identity for the new item");}if(dojo.isArray(_7)){throw new Error("newItem() was not passed an single-valued identity");}}if(this._itemsByIdentity){this._assert(typeof this._itemsByIdentity[_7]==="undefined");}this._assert(typeof this._pending._newItems[_7]==="undefined");this._assert(typeof this._pending._deletedItems[_7]==="undefined");var _9={};_9[this._storeRefPropName]=this;_9[this._itemNumPropName]=this._arrayOfAllItems.length;if(this._itemsByIdentity){this._itemsByIdentity[_7]=_9;}this._arrayOfAllItems.push(_9);var _a=null;if(_6&&_6.parent&&_6.attribute){_a={item:_6.parent,attribute:_6.attribute,oldValue:undefined};var _b=this.getValues(_6.parent,_6.attribute);if(_b&&_b.length>0){var _c=_b.slice(0,_b.length);if(_b.length===1){_a.oldValue=_b[0];}else{_a.oldValue=_b.slice(0,_b.length);}_c.push(_9);this._setValueOrValues(_6.parent,_6.attribute,_c,false);_a.newValue=this.getValues(_6.parent,_6.attribute);}else{this._setValueOrValues(_6.parent,_6.attribute,_9,false);_a.newValue=_9;}}else{_9[this._rootItemPropName]=true;this._arrayOfTopLevelItems.push(_9);}this._pending._newItems[_7]=_9;for(var _d in _5){if(_d===this._storeRefPropName||_d===this._itemNumPropName){throw new Error("encountered bug in ItemFileWriteStore.newItem");}var _e=_5[_d];if(!dojo.isArray(_e)){_e=[_e];}_9[_d]=_e;}this.onNew(_9,_a);return _9;},_removeArrayElement:function(_f,_10){var _11=dojo.indexOf(_f,_10);if(_11!=-1){_f.splice(_11,1);return true;}return false;},deleteItem:function(_12){this._assert(!this._saveInProgress);this._assertIsItem(_12);var _13=_12[this._itemNumPropName];this._arrayOfAllItems[_13]=null;var _14=this.getIdentity(_12);_12[this._storeRefPropName]=null;if(this._itemsByIdentity){delete this._itemsByIdentity[_14];}this._pending._deletedItems[_14]=_12;if(_12[this._rootItemPropName]){this._removeArrayElement(this._arrayOfTopLevelItems,_12);}this.onDelete(_12);return true;},setValue:function(_15,_16,_17){return this._setValueOrValues(_15,_16,_17,true);},setValues:function(_18,_19,_1a){return this._setValueOrValues(_18,_19,_1a,true);},unsetAttribute:function(_1b,_1c){return this._setValueOrValues(_1b,_1c,[],true);},_setValueOrValues:function(_1d,_1e,_1f,_20){this._assert(!this._saveInProgress);this._assertIsItem(_1d);this._assert(dojo.isString(_1e));this._assert(typeof _1f!=="undefined");var _21=this._getIdentifierAttribute();if(_1e==_21){throw new Error("ItemFileWriteStore does not have support for changing the value of an item's identifier.");}var _22=this._getValueOrValues(_1d,_1e);var _23=this.getIdentity(_1d);if(!this._pending._modifiedItems[_23]){var _24={};for(var key in _1d){if((key===this._storeRefPropName)||(key===this._itemNumPropName)||(key===this._rootItemPropName)){_24[key]=_1d[key];}else{var _26=_1d[key];var _27=[];for(var i=0;i<_26.length;++i){_27.push(_26[i]);}_24[key]=_27;}}this._pending._modifiedItems[_23]=_24;}var _29=false;if(dojo.isArray(_1f)&&_1f.length===0){_29=delete _1d[_1e];_1f=undefined;}else{var _2a=[];if(dojo.isArray(_1f)){var _2b=_1f;for(var j=0;j<_2b.length;++j){_2a.push(_2b[j]);}}else{var _2d=_1f;_2a.push(_2d);}_1d[_1e]=_2a;_29=true;}if(_20){this.onSet(_1d,_1e,_22,_1f);}return _29;},_getValueOrValues:function(_2e,_2f){var _30=undefined;if(this.hasAttribute(_2e,_2f)){var _31=this.getValues(_2e,_2f);if(_31.length==1){_30=_31[0];}else{_30=_31;}}return _30;},_flatten:function(_32){if(this.isItem(_32)){var _33=_32;var _34=this.getIdentity(_33);var _35={_reference:_34};return _35;}else{if(typeof _32==="object"){for(type in this._datatypeMap){var _36=this._datatypeMap[type];if(dojo.isObject(_36)&&!dojo.isFunction(_36)){if(_32 instanceof _36.type){if(!_36.serialize){throw new Error("ItemFileWriteStore: No serializer defined for type mapping: ["+type+"]");}return {_type:type,_value:_36.serialize(_32)};}}else{if(_32 instanceof _36){return {_type:type,_value:_32.toString()};}}}}return _32;}},_getNewFileContentString:function(){var _37={};var _38=this._getIdentifierAttribute();if(_38!==Number){_37.identifier=_38;}if(this._labelAttr){_37.label=this._labelAttr;}_37.items=[];for(var i=0;i0){var _c=_b.slice(0,_b.length);if(_b.length===1){_a.oldValue=_b[0];}else{_a.oldValue=_b.slice(0,_b.length);}_c.push(_9);this._setValueOrValues(_6.parent,_6.attribute,_c,false);_a.newValue=this.getValues(_6.parent,_6.attribute);}else{this._setValueOrValues(_6.parent,_6.attribute,_9,false);_a.newValue=_9;}}else{_9[this._rootItemPropName]=true;this._arrayOfTopLevelItems.push(_9);}this._pending._newItems[_7]=_9;for(var _d in _5){if(_d===this._storeRefPropName||_d===this._itemNumPropName){throw new Error("encountered bug in ItemFileWriteStore.newItem");}var _e=_5[_d];if(!dojo.isArray(_e)){_e=[_e];}_9[_d]=_e;if(this.referenceIntegrity){for(var i=0;i<_e.length;i++){var val=_e[i];if(this.isItem(val)){this._addReferenceToMap(val,_9,_d);}}}}this.onNew(_9,_a);return _9;},_removeArrayElement:function(_11,_12){var _13=dojo.indexOf(_11,_12);if(_13!=-1){_11.splice(_13,1);return true;}return false;},deleteItem:function(_14){this._assert(!this._saveInProgress);this._assertIsItem(_14);var _15=_14[this._itemNumPropName];var _16=this.getIdentity(_14);if(this.referenceIntegrity){var _17=this.getAttributes(_14);if(_14[this._reverseRefMap]){_14["backup_"+this._reverseRefMap]=dojo.clone(_14[this._reverseRefMap]);}dojo.forEach(_17,function(_18){dojo.forEach(this.getValues(_14,_18),function(_19){if(this.isItem(_19)){if(!_14["backupRefs_"+this._reverseRefMap]){_14["backupRefs_"+this._reverseRefMap]=[];}_14["backupRefs_"+this._reverseRefMap].push({id:this.getIdentity(_19),attr:_18});this._removeReferenceFromMap(_19,_14,_18);}},this);},this);var _1a=_14[this._reverseRefMap];if(_1a){for(var _1b in _1a){var _1c=null;if(this._itemsByIdentity){_1c=this._itemsByIdentity[_1b];}else{_1c=this._arrayOfAllItems[_1b];}if(_1c){for(var _1d in _1a[_1b]){var _1e=this.getValues(_1c,_1d)||[];var _1f=dojo.filter(_1e,function(_20){return !(this.isItem(_20)&&this.getIdentity(_20)==_16);},this);this._removeReferenceFromMap(_14,_1c,_1d);if(_1f.length<_1e.length){this._setValueOrValues(_1c,_1d,_1f,true);}}}}}}this._arrayOfAllItems[_15]=null;_14[this._storeRefPropName]=null;if(this._itemsByIdentity){delete this._itemsByIdentity[_16];}this._pending._deletedItems[_16]=_14;if(_14[this._rootItemPropName]){this._removeArrayElement(this._arrayOfTopLevelItems,_14);}this.onDelete(_14);return true;},setValue:function(_21,_22,_23){return this._setValueOrValues(_21,_22,_23,true);},setValues:function(_24,_25,_26){return this._setValueOrValues(_24,_25,_26,true);},unsetAttribute:function(_27,_28){return this._setValueOrValues(_27,_28,[],true);},_setValueOrValues:function(_29,_2a,_2b,_2c){this._assert(!this._saveInProgress);this._assertIsItem(_29);this._assert(dojo.isString(_2a));this._assert(typeof _2b!=="undefined");var _2d=this._getIdentifierAttribute();if(_2a==_2d){throw new Error("ItemFileWriteStore does not have support for changing the value of an item's identifier.");}var _2e=this._getValueOrValues(_29,_2a);var _2f=this.getIdentity(_29);if(!this._pending._modifiedItems[_2f]){var _30={};for(var key in _29){if((key===this._storeRefPropName)||(key===this._itemNumPropName)||(key===this._rootItemPropName)){_30[key]=_29[key];}else{if(key===this._reverseRefMap){_30[key]=dojo.clone(_29[key]);}else{_30[key]=_29[key].slice(0,_29[key].length);}}}this._pending._modifiedItems[_2f]=_30;}var _32=false;if(dojo.isArray(_2b)&&_2b.length===0){_32=delete _29[_2a];_2b=undefined;if(this.referenceIntegrity&&_2e){var _33=_2e;if(!dojo.isArray(_33)){_33=[_33];}for(var i=0;i<_33.length;i++){var _35=_33[i];if(this.isItem(_35)){this._removeReferenceFromMap(_35,_29,_2a);}}}}else{var _36;if(dojo.isArray(_2b)){var _37=_2b;_36=_2b.slice(0,_2b.length);}else{_36=[_2b];}if(this.referenceIntegrity){if(_2e){var _33=_2e;if(!dojo.isArray(_33)){_33=[_33];}var map={};dojo.forEach(_33,function(_39){if(this.isItem(_39)){var id=this.getIdentity(_39);map[id.toString()]=true;}},this);dojo.forEach(_36,function(_3b){if(this.isItem(_3b)){var id=this.getIdentity(_3b);if(map[id.toString()]){delete map[id.toString()];}else{this._addReferenceToMap(_3b,_29,_2a);}}},this);for(var rId in map){var _3e;if(this._itemsByIdentity){_3e=this._itemsByIdentity[rId];}else{_3e=this._arrayOfAllItems[rId];}this._removeReferenceFromMap(_3e,_29,_2a);}}else{for(var i=0;i<_36.length;i++){var _35=_36[i];if(this.isItem(_35)){this._addReferenceToMap(_35,_29,_2a);}}}}_29[_2a]=_36;_32=true;}if(_2c){this.onSet(_29,_2a,_2e,_2b);}return _32;},_addReferenceToMap:function(_3f,_40,_41){var _42=this.getIdentity(_40);var _43=_3f[this._reverseRefMap];if(!_43){_43=_3f[this._reverseRefMap]={};}var _44=_43[_42];if(!_44){_44=_43[_42]={};}_44[_41]=true;},_removeReferenceFromMap:function(_45,_46,_47){var _48=this.getIdentity(_46);var _49=_45[this._reverseRefMap];var _4a;if(_49){for(_4a in _49){if(_4a==_48){delete _49[_4a][_47];if(this._isEmpty(_49[_4a])){delete _49[_4a];}}}if(this._isEmpty(_49)){delete _45[this._reverseRefMap];}}},_dumpReferenceMap:function(){var i;for(i=0;i0){_63=false;}}}return _63;},save:function(_65){this._assert(!this._saveInProgress);this._saveInProgress=true;var _66=this;var _67=function(){_66._pending={_newItems:{},_modifiedItems:{},_deletedItems:{}};_66._saveInProgress=false;if(_65&&_65.onComplete){var _68=_65.scope||dojo.global;_65.onComplete.call(_68);}};var _69=function(){_66._saveInProgress=false;if(_65&&_65.onError){var _6a=_65.scope||dojo.global;_65.onError.call(_6a);}};if(this._saveEverything){var _6b=this._getNewFileContentString();this._saveEverything(_67,_69,_6b);}if(this._saveCustom){this._saveCustom(_67,_69);}if(!this._saveEverything&&!this._saveCustom){_67();}},revert:function(){this._assert(!this._saveInProgress);var _6c;for(_6c in this._pending._modifiedItems){var _6d=this._pending._modifiedItems[_6c];var _6e=null;if(this._itemsByIdentity){_6e=this._itemsByIdentity[_6c];}else{_6e=this._arrayOfAllItems[_6c];}_6d[this._storeRefPropName]=this;_6e[this._storeRefPropName]=null;var _6f=_6e[this._itemNumPropName];this._arrayOfAllItems[_6f]=_6d;if(_6e[this._rootItemPropName]){var i;for(i=0;i= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ diff --git a/spring-js/src/main/resources/META-INF/dojo/data/api/Notification.js b/spring-js/src/main/resources/META-INF/dojo/data/api/Notification.js index 8ad9f6d6..7a2f06e0 100644 --- a/spring-js/src/main/resources/META-INF/dojo/data/api/Notification.js +++ b/spring-js/src/main/resources/META-INF/dojo/data/api/Notification.js @@ -1,11 +1,7 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ diff --git a/spring-js/src/main/resources/META-INF/dojo/data/api/Read.js b/spring-js/src/main/resources/META-INF/dojo/data/api/Read.js index 3885768b..f8aa32fd 100644 --- a/spring-js/src/main/resources/META-INF/dojo/data/api/Read.js +++ b/spring-js/src/main/resources/META-INF/dojo/data/api/Read.js @@ -1,11 +1,7 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ diff --git a/spring-js/src/main/resources/META-INF/dojo/data/api/Request.js b/spring-js/src/main/resources/META-INF/dojo/data/api/Request.js index f5c86929..8afbeb8f 100644 --- a/spring-js/src/main/resources/META-INF/dojo/data/api/Request.js +++ b/spring-js/src/main/resources/META-INF/dojo/data/api/Request.js @@ -1,11 +1,7 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ diff --git a/spring-js/src/main/resources/META-INF/dojo/data/api/Write.js b/spring-js/src/main/resources/META-INF/dojo/data/api/Write.js index 7d2f2576..9c512322 100644 --- a/spring-js/src/main/resources/META-INF/dojo/data/api/Write.js +++ b/spring-js/src/main/resources/META-INF/dojo/data/api/Write.js @@ -1,11 +1,7 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ diff --git a/spring-js/src/main/resources/META-INF/dojo/data/util/filter.js b/spring-js/src/main/resources/META-INF/dojo/data/util/filter.js index 59d03ba8..8268d9b7 100644 --- a/spring-js/src/main/resources/META-INF/dojo/data/util/filter.js +++ b/spring-js/src/main/resources/META-INF/dojo/data/util/filter.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo.data.util.filter"]){dojo._hasResource["dojo.data.util.filter"]=true;dojo.provide("dojo.data.util.filter");dojo.data.util.filter.patternToRegExp=function(_1,_2){var _3="^";var c=null;for(var i=0;i<_1.length;i++){c=_1.charAt(i);switch(c){case "\\":_3+=c;i++;_3+=_1.charAt(i);break;case "*":_3+=".*";break;case "?":_3+=".";break;case "$":case "^":case "/":case "+":case ".":case "|":case "(":case ")":case "{":case "}":case "[":case "]":_3+="\\";default:_3+=c;}}_3+="$";if(_2){return new RegExp(_3,"i");}else{return new RegExp(_3);}};} \ No newline at end of file +if(!dojo._hasResource["dojo.data.util.filter"]){dojo._hasResource["dojo.data.util.filter"]=true;dojo.provide("dojo.data.util.filter");dojo.data.util.filter.patternToRegExp=function(_1,_2){var _3="^";var c=null;for(var i=0;i<_1.length;i++){c=_1.charAt(i);switch(c){case "\\":_3+=c;i++;_3+=_1.charAt(i);break;case "*":_3+=".*";break;case "?":_3+=".";break;case "$":case "^":case "/":case "+":case ".":case "|":case "(":case ")":case "{":case "}":case "[":case "]":_3+="\\";default:_3+=c;}}_3+="$";if(_2){return new RegExp(_3,"mi");}else{return new RegExp(_3,"m");}};} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/data/util/simpleFetch.js b/spring-js/src/main/resources/META-INF/dojo/data/util/simpleFetch.js index 14a7fd0e..21813be1 100644 --- a/spring-js/src/main/resources/META-INF/dojo/data/util/simpleFetch.js +++ b/spring-js/src/main/resources/META-INF/dojo/data/util/simpleFetch.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo.data.util.simpleFetch"]){dojo._hasResource["dojo.data.util.simpleFetch"]=true;dojo.provide("dojo.data.util.simpleFetch");dojo.require("dojo.data.util.sorter");dojo.data.util.simpleFetch.fetch=function(_1){_1=_1||{};if(!_1.store){_1.store=this;}var _2=this;var _3=function(_4,_5){if(_5.onError){var _6=_5.scope||dojo.global;_5.onError.call(_6,_4,_5);}};var _7=function(_8,_9){var _a=_9.abort||null;var _b=false;var _c=_9.start?_9.start:0;var _d=_9.count?(_c+_9.count):_8.length;_9.abort=function(){_b=true;if(_a){_a.call(_9);}};var _e=_9.scope||dojo.global;if(!_9.store){_9.store=_2;}if(_9.onBegin){_9.onBegin.call(_e,_8.length,_9);}if(_9.sort){_8.sort(dojo.data.util.sorter.createSortFunction(_9.sort,_2));}if(_9.onItem){for(var i=_c;(i<_8.length)&&(i<_d);++i){var _10=_8[i];if(!_b){_9.onItem.call(_e,_10,_9);}}}if(_9.onComplete&&!_b){var _11=null;if(!_9.onItem){_11=_8.slice(_c,_d);}_9.onComplete.call(_e,_11,_9);}};this._fetchItems(_1,_7,_3);return _1;};} \ No newline at end of file +if(!dojo._hasResource["dojo.data.util.simpleFetch"]){dojo._hasResource["dojo.data.util.simpleFetch"]=true;dojo.provide("dojo.data.util.simpleFetch");dojo.require("dojo.data.util.sorter");dojo.data.util.simpleFetch.fetch=function(_1){_1=_1||{};if(!_1.store){_1.store=this;}var _2=this;var _3=function(_4,_5){if(_5.onError){var _6=_5.scope||dojo.global;_5.onError.call(_6,_4,_5);}};var _7=function(_8,_9){var _a=_9.abort||null;var _b=false;var _c=_9.start?_9.start:0;var _d=(_9.count&&(_9.count!==Infinity))?(_c+_9.count):_8.length;_9.abort=function(){_b=true;if(_a){_a.call(_9);}};var _e=_9.scope||dojo.global;if(!_9.store){_9.store=_2;}if(_9.onBegin){_9.onBegin.call(_e,_8.length,_9);}if(_9.sort){_8.sort(dojo.data.util.sorter.createSortFunction(_9.sort,_2));}if(_9.onItem){for(var i=_c;(i<_8.length)&&(i<_d);++i){var _10=_8[i];if(!_b){_9.onItem.call(_e,_10,_9);}}}if(_9.onComplete&&!_b){var _11=null;if(!_9.onItem){_11=_8.slice(_c,_d);}_9.onComplete.call(_e,_11,_9);}};this._fetchItems(_1,_7,_3);return _1;};} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/data/util/sorter.js b/spring-js/src/main/resources/META-INF/dojo/data/util/sorter.js index 2efbcfad..af381665 100644 --- a/spring-js/src/main/resources/META-INF/dojo/data/util/sorter.js +++ b/spring-js/src/main/resources/META-INF/dojo/data/util/sorter.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo.data.util.sorter"]){dojo._hasResource["dojo.data.util.sorter"]=true;dojo.provide("dojo.data.util.sorter");dojo.data.util.sorter.basicComparator=function(a,b){var _3=0;if(a>b||typeof a==="undefined"||a===null){_3=1;}else{if(ab||typeof a==="undefined"||a===null){_3=1;}else{if(a= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo.date"]){dojo._hasResource["dojo.date"]=true;dojo.provide("dojo.date");dojo.date.getDaysInMonth=function(_1){var _2=_1.getMonth();var _3=[31,28,31,30,31,30,31,31,30,31,30,31];if(_2==1&&dojo.date.isLeapYear(_1)){return 29;}return _3[_2];};dojo.date.isLeapYear=function(_4){var _5=_4.getFullYear();return !(_5%400)||(!(_5%4)&&!!(_5%100));};dojo.date.getTimezoneName=function(_6){var _7=_6.toString();var tz="";var _9;var _a=_7.indexOf("(");if(_a>-1){tz=_7.substring(++_a,_7.indexOf(")"));}else{var _b=/([A-Z\/]+) \d{4}$/;if((_9=_7.match(_b))){tz=_9[1];}else{_7=_6.toLocaleString();_b=/ ([A-Z\/]+)$/;if((_9=_7.match(_b))){tz=_9[1];}}}return (tz=="AM"||tz=="PM")?"":tz;};dojo.date.compare=function(_c,_d,_e){_c=new Date(Number(_c));_d=new Date(Number(_d||new Date()));if(typeof _e!=="undefined"){if(_e=="date"){_c.setHours(0,0,0,0);_d.setHours(0,0,0,0);}else{if(_e=="time"){_c.setFullYear(0,0,0);_d.setFullYear(0,0,0);}}}if(_c>_d){return 1;}if(_c<_d){return -1;}return 0;};dojo.date.add=function(_f,_10,_11){var sum=new Date(Number(_f));var _13=false;var _14="Date";switch(_10){case "day":break;case "weekday":var _15,_16;var adj=0;var mod=_11%5;if(!mod){_15=(_11>0)?5:-5;_16=(_11>0)?((_11-5)/5):((_11+5)/5);}else{_15=mod;_16=parseInt(_11/5);}var _19=_f.getDay();if(_19==6&&_11>0){adj=1;}else{if(_19==0&&_11<0){adj=-1;}}var _1a=_19+_15;if(_1a==0||_1a==6){adj=(_11>0)?2:-2;}_11=7*_16+_15+adj;break;case "year":_14="FullYear";_13=true;break;case "week":_11*=7;break;case "quarter":_11*=3;case "month":_13=true;_14="Month";break;case "hour":case "minute":case "second":case "millisecond":_14="UTC"+_10.charAt(0).toUpperCase()+_10.substring(1)+"s";}if(_14){sum["set"+_14](sum["get"+_14]()+_11);}if(_13&&(sum.getDate()<_f.getDate())){sum.setDate(0);}return sum;};dojo.date.difference=function(_1b,_1c,_1d){_1c=_1c||new Date();_1d=_1d||"day";var _1e=_1c.getFullYear()-_1b.getFullYear();var _1f=1;switch(_1d){case "quarter":var m1=_1b.getMonth();var m2=_1c.getMonth();var q1=Math.floor(m1/3)+1;var q2=Math.floor(m2/3)+1;q2+=(_1e*4);_1f=q2-q1;break;case "weekday":var _24=Math.round(dojo.date.difference(_1b,_1c,"day"));var _25=parseInt(dojo.date.difference(_1b,_1c,"week"));var mod=_24%7;if(mod==0){_24=_25*5;}else{var adj=0;var _28=_1b.getDay();var _29=_1c.getDay();_25=parseInt(_24/7);mod=_24%7;var _2a=new Date(_1b);_2a.setDate(_2a.getDate()+(_25*7));var _2b=_2a.getDay();if(_24>0){switch(true){case _28==6:adj=-1;break;case _28==0:adj=0;break;case _29==6:adj=-1;break;case _29==0:adj=-2;break;case (_2b+mod)>5:adj=-2;}}else{if(_24<0){switch(true){case _28==6:adj=0;break;case _28==0:adj=1;break;case _29==6:adj=2;break;case _29==0:adj=1;break;case (_2b+mod)<0:adj=2;}}}_24+=adj;_24-=(_25*2);}_1f=_24;break;case "year":_1f=_1e;break;case "month":_1f=(_1c.getMonth()-_1b.getMonth())+(_1e*12);break;case "week":_1f=parseInt(dojo.date.difference(_1b,_1c,"day")/7);break;case "day":_1f/=24;case "hour":_1f/=60;case "minute":_1f/=60;case "second":_1f/=1000;case "millisecond":_1f*=_1c.getTime()-_1b.getTime();}return Math.round(_1f);};} \ No newline at end of file +if(!dojo._hasResource["dojo.date"]){dojo._hasResource["dojo.date"]=true;dojo.provide("dojo.date");dojo.date.getDaysInMonth=function(_1){var _2=_1.getMonth();var _3=[31,28,31,30,31,30,31,31,30,31,30,31];if(_2==1&&dojo.date.isLeapYear(_1)){return 29;}return _3[_2];};dojo.date.isLeapYear=function(_4){var _5=_4.getFullYear();return !(_5%400)||(!(_5%4)&&!!(_5%100));};dojo.date.getTimezoneName=function(_6){var _7=_6.toString();var tz="";var _9;var _a=_7.indexOf("(");if(_a>-1){tz=_7.substring(++_a,_7.indexOf(")"));}else{var _b=/([A-Z\/]+) \d{4}$/;if((_9=_7.match(_b))){tz=_9[1];}else{_7=_6.toLocaleString();_b=/ ([A-Z\/]+)$/;if((_9=_7.match(_b))){tz=_9[1];}}}return (tz=="AM"||tz=="PM")?"":tz;};dojo.date.compare=function(_c,_d,_e){_c=new Date(Number(_c));_d=new Date(Number(_d||new Date()));if(_e!=="undefined"){if(_e=="date"){_c.setHours(0,0,0,0);_d.setHours(0,0,0,0);}else{if(_e=="time"){_c.setFullYear(0,0,0);_d.setFullYear(0,0,0);}}}if(_c>_d){return 1;}if(_c<_d){return -1;}return 0;};dojo.date.add=function(_f,_10,_11){var sum=new Date(Number(_f));var _13=false;var _14="Date";switch(_10){case "day":break;case "weekday":var _15,_16;var mod=_11%5;if(!mod){_15=(_11>0)?5:-5;_16=(_11>0)?((_11-5)/5):((_11+5)/5);}else{_15=mod;_16=parseInt(_11/5);}var _18=_f.getDay();var adj=0;if(_18==6&&_11>0){adj=1;}else{if(_18==0&&_11<0){adj=-1;}}var _1a=_18+_15;if(_1a==0||_1a==6){adj=(_11>0)?2:-2;}_11=(7*_16)+_15+adj;break;case "year":_14="FullYear";_13=true;break;case "week":_11*=7;break;case "quarter":_11*=3;case "month":_13=true;_14="Month";break;case "hour":case "minute":case "second":case "millisecond":_14="UTC"+_10.charAt(0).toUpperCase()+_10.substring(1)+"s";}if(_14){sum["set"+_14](sum["get"+_14]()+_11);}if(_13&&(sum.getDate()<_f.getDate())){sum.setDate(0);}return sum;};dojo.date.difference=function(_1b,_1c,_1d){_1c=_1c||new Date();_1d=_1d||"day";var _1e=_1c.getFullYear()-_1b.getFullYear();var _1f=1;switch(_1d){case "quarter":var m1=_1b.getMonth();var m2=_1c.getMonth();var q1=Math.floor(m1/3)+1;var q2=Math.floor(m2/3)+1;q2+=(_1e*4);_1f=q2-q1;break;case "weekday":var _24=Math.round(dojo.date.difference(_1b,_1c,"day"));var _25=parseInt(dojo.date.difference(_1b,_1c,"week"));var mod=_24%7;if(mod==0){_24=_25*5;}else{var adj=0;var _28=_1b.getDay();var _29=_1c.getDay();_25=parseInt(_24/7);mod=_24%7;var _2a=new Date(_1b);_2a.setDate(_2a.getDate()+(_25*7));var _2b=_2a.getDay();if(_24>0){switch(true){case _28==6:adj=-1;break;case _28==0:adj=0;break;case _29==6:adj=-1;break;case _29==0:adj=-2;break;case (_2b+mod)>5:adj=-2;}}else{if(_24<0){switch(true){case _28==6:adj=0;break;case _28==0:adj=1;break;case _29==6:adj=2;break;case _29==0:adj=1;break;case (_2b+mod)<0:adj=2;}}}_24+=adj;_24-=(_25*2);}_1f=_24;break;case "year":_1f=_1e;break;case "month":_1f=(_1c.getMonth()-_1b.getMonth())+(_1e*12);break;case "week":_1f=parseInt(dojo.date.difference(_1b,_1c,"day")/7);break;case "day":_1f/=24;case "hour":_1f/=60;case "minute":_1f/=60;case "second":_1f/=1000;case "millisecond":_1f*=_1c.getTime()-_1b.getTime();}return Math.round(_1f);};} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/date/locale.js b/spring-js/src/main/resources/META-INF/dojo/date/locale.js index 72c1ce18..465a6b1f 100644 --- a/spring-js/src/main/resources/META-INF/dojo/date/locale.js +++ b/spring-js/src/main/resources/META-INF/dojo/date/locale.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo.date.locale"]){dojo._hasResource["dojo.date.locale"]=true;dojo.provide("dojo.date.locale");dojo.require("dojo.date");dojo.require("dojo.cldr.supplemental");dojo.require("dojo.regexp");dojo.require("dojo.string");dojo.require("dojo.i18n");dojo.requireLocalization("dojo.cldr","gregorian",null,"de,en,en-au,en-ca,en-gb,es,es-es,fr,ROOT,it,it-it,ja,ko,ko-kr,pt,pt-br,zh,zh-cn");(function(){function formatPattern(_1,_2,_3){return _3.replace(/([a-z])\1*/ig,function(_4){var s;var c=_4.charAt(0);var l=_4.length;var _8;var _9=["abbr","wide","narrow"];switch(c){case "G":s=_2[(l<4)?"eraAbbr":"eraNames"][_1.getFullYear()<0?0:1];break;case "y":s=_1.getFullYear();switch(l){case 1:break;case 2:s=String(s);s=s.substr(s.length-2);break;default:_8=true;}break;case "Q":case "q":s=Math.ceil((_1.getMonth()+1)/3);_8=true;break;case "M":case "L":var m=_1.getMonth();var _b;switch(l){case 1:case 2:s=m+1;_8=true;break;case 3:case 4:case 5:_b=_9[l-3];break;}if(_b){var _c=(c=="L")?"standalone":"format";var _d=["months",_c,_b].join("-");s=_2[_d][m];}break;case "w":var _e=0;s=dojo.date.locale._getWeekOfYear(_1,_e);_8=true;break;case "d":s=_1.getDate();_8=true;break;case "D":s=dojo.date.locale._getDayOfYear(_1);_8=true;break;case "E":case "e":case "c":var d=_1.getDay();var _b;switch(l){case 1:case 2:if(c=="e"){var _10=dojo.cldr.supplemental.getFirstDayOfWeek(options.locale);d=(d-_10+7)%7;}if(c!="c"){s=d+1;_8=true;break;}case 3:case 4:case 5:_b=_9[l-3];break;}if(_b){var _c=(c=="c")?"standalone":"format";var _d=["days",_c,_b].join("-");s=_2[_d][d];}break;case "a":var _11=(_1.getHours()<12)?"am":"pm";s=_2[_11];break;case "h":case "H":case "K":case "k":var h=_1.getHours();switch(c){case "h":s=(h%12)||12;break;case "H":s=h;break;case "K":s=(h%12);break;case "k":s=h||24;break;}_8=true;break;case "m":s=_1.getMinutes();_8=true;break;case "s":s=_1.getSeconds();_8=true;break;case "S":s=Math.round(_1.getMilliseconds()*Math.pow(10,l-3));break;case "v":case "z":s=dojo.date.getTimezoneName(_1);if(s){break;}l=4;case "Z":var _13=_1.getTimezoneOffset();var tz=[(_13<=0?"+":"-"),dojo.string.pad(Math.floor(Math.abs(_13)/60),2),dojo.string.pad(Math.abs(_13)%60,2)];if(l==4){tz.splice(0,0,"GMT");tz.splice(3,0,":");}s=tz.join("");break;default:throw new Error("dojo.date.locale.format: invalid pattern char: "+_3);}if(_8){s=dojo.string.pad(s,l);}return s;});};dojo.date.locale.format=function(_15,_16){_16=_16||{};var _17=dojo.i18n.normalizeLocale(_16.locale);var _18=_16.formatLength||"short";var _19=dojo.date.locale._getGregorianBundle(_17);var str=[];var _1b=dojo.hitch(this,formatPattern,_15,_19);if(_16.selector=="year"){var _1c=_15.getFullYear();if(_17.match(/^zh|^ja/)){_1c+="年";}return _1c;}if(_16.selector!="time"){var _1d=_16.datePattern||_19["dateFormat-"+_18];if(_1d){str.push(_processPattern(_1d,_1b));}}if(_16.selector!="date"){var _1e=_16.timePattern||_19["timeFormat-"+_18];if(_1e){str.push(_processPattern(_1e,_1b));}}var _1f=str.join(" ");return _1f;};dojo.date.locale.regexp=function(_20){return dojo.date.locale._parseInfo(_20).regexp;};dojo.date.locale._parseInfo=function(_21){_21=_21||{};var _22=dojo.i18n.normalizeLocale(_21.locale);var _23=dojo.date.locale._getGregorianBundle(_22);var _24=_21.formatLength||"short";var _25=_21.datePattern||_23["dateFormat-"+_24];var _26=_21.timePattern||_23["timeFormat-"+_24];var _27;if(_21.selector=="date"){_27=_25;}else{if(_21.selector=="time"){_27=_26;}else{_27=_25+" "+_26;}}var _28=[];var re=_processPattern(_27,dojo.hitch(this,_buildDateTimeRE,_28,_23,_21));return {regexp:re,tokens:_28,bundle:_23};};dojo.date.locale.parse=function(_2a,_2b){var _2c=dojo.date.locale._parseInfo(_2b);var _2d=_2c.tokens,_2e=_2c.bundle;var re=new RegExp("^"+_2c.regexp+"$");var _30=re.exec(_2a);if(!_30){return null;}var _31=["abbr","wide","narrow"];var _32=new Date(1972,0);var _33={};var _34="";dojo.forEach(_30,function(v,i){if(!i){return;}var _37=_2d[i-1];var l=_37.length;switch(_37.charAt(0)){case "y":if(l!=2){_32.setFullYear(v);_33.year=v;}else{if(v<100){v=Number(v);var _39=""+new Date().getFullYear();var _3a=_39.substring(0,2)*100;var _3b=Number(_39.substring(2,4));var _3c=Math.min(_3b+20,99);var num=(v<_3c)?_3a+v:_3a-100+v;_32.setFullYear(num);_33.year=num;}else{if(_2b.strict){return null;}_32.setFullYear(v);_33.year=v;}}break;case "M":if(l>2){var _3e=_2e["months-format-"+_31[l-3]].concat();if(!_2b.strict){v=v.replace(".","").toLowerCase();_3e=dojo.map(_3e,function(s){return s.replace(".","").toLowerCase();});}v=dojo.indexOf(_3e,v);if(v==-1){return null;}}else{v--;}_32.setMonth(v);_33.month=v;break;case "E":case "e":var _40=_2e["days-format-"+_31[l-3]].concat();if(!_2b.strict){v=v.toLowerCase();_40=dojo.map(_40,"".toLowerCase);}v=dojo.indexOf(_40,v);if(v==-1){return null;}break;case "d":_32.setDate(v);_33.date=v;break;case "D":_32.setMonth(0);_32.setDate(v);break;case "a":var am=_2b.am||_2e.am;var pm=_2b.pm||_2e.pm;if(!_2b.strict){var _43=/\./g;v=v.replace(_43,"").toLowerCase();am=am.replace(_43,"").toLowerCase();pm=pm.replace(_43,"").toLowerCase();}if(_2b.strict&&v!=am&&v!=pm){return null;}_34=(v==pm)?"p":(v==am)?"a":"";break;case "K":if(v==24){v=0;}case "h":case "H":case "k":if(v>23){return null;}_32.setHours(v);break;case "m":_32.setMinutes(v);break;case "s":_32.setSeconds(v);break;case "S":_32.setMilliseconds(v);}});var _44=_32.getHours();if(_34==="p"&&_44<12){_32.setHours(_44+12);}else{if(_34==="a"&&_44==12){_32.setHours(0);}}if(_33.year&&_32.getFullYear()!=_33.year){return null;}if(_33.month&&_32.getMonth()!=_33.month){return null;}if(_33.date&&_32.getDate()!=_33.date){return null;}return _32;};function _processPattern(_45,_46,_47,_48){var _49=function(x){return x;};_46=_46||_49;_47=_47||_49;_48=_48||_49;var _4b=_45.match(/(''|[^'])+/g);var _4c=false;dojo.forEach(_4b,function(_4d,i){if(!_4d){_4b[i]="";}else{_4b[i]=(_4c?_47:_46)(_4d);_4c=!_4c;}});return _48(_4b.join(""));};function _buildDateTimeRE(_4f,_50,_51,_52){_52=dojo.regexp.escapeString(_52);if(!_51.strict){_52=_52.replace(" a"," ?a");}return _52.replace(/([a-z])\1*/ig,function(_53){var s;var c=_53.charAt(0);var l=_53.length;var p2="",p3="";if(_51.strict){if(l>1){p2="0"+"{"+(l-1)+"}";}if(l>2){p3="0"+"{"+(l-2)+"}";}}else{p2="0?";p3="0{0,2}";}switch(c){case "y":s="\\d{2,4}";break;case "M":s=(l>2)?"\\S+":p2+"[1-9]|1[0-2]";break;case "D":s=p2+"[1-9]|"+p3+"[1-9][0-9]|[12][0-9][0-9]|3[0-5][0-9]|36[0-6]";break;case "d":s=p2+"[1-9]|[12]\\d|3[01]";break;case "w":s=p2+"[1-9]|[1-4][0-9]|5[0-3]";break;case "E":s="\\S+";break;case "h":s=p2+"[1-9]|1[0-2]";break;case "k":s=p2+"\\d|1[01]";break;case "H":s=p2+"\\d|1\\d|2[0-3]";break;case "K":s=p2+"[1-9]|1\\d|2[0-4]";break;case "m":case "s":s="[0-5]\\d";break;case "S":s="\\d{"+l+"}";break;case "a":var am=_51.am||_50.am||"AM";var pm=_51.pm||_50.pm||"PM";if(_51.strict){s=am+"|"+pm;}else{s=am+"|"+pm;if(am!=am.toLowerCase()){s+="|"+am.toLowerCase();}if(pm!=pm.toLowerCase()){s+="|"+pm.toLowerCase();}}break;default:s=".*";}if(_4f){_4f.push(_53);}return "("+s+")";}).replace(/[\xa0 ]/g,"[\\s\\xa0]");};})();(function(){var _5b=[];dojo.date.locale.addCustomFormats=function(_5c,_5d){_5b.push({pkg:_5c,name:_5d});};dojo.date.locale._getGregorianBundle=function(_5e){var _5f={};dojo.forEach(_5b,function(_60){var _61=dojo.i18n.getLocalization(_60.pkg,_60.name,_5e);_5f=dojo.mixin(_5f,_61);},this);return _5f;};})();dojo.date.locale.addCustomFormats("dojo.cldr","gregorian");dojo.date.locale.getNames=function(_62,_63,use,_65){var _66;var _67=dojo.date.locale._getGregorianBundle(_65);var _68=[_62,use,_63];if(use=="standAlone"){_66=_67[_68.join("-")];}_68[1]="format";return (_66||_67[_68.join("-")]).concat();};dojo.date.locale.isWeekend=function(_69,_6a){var _6b=dojo.cldr.supplemental.getWeekend(_6a);var day=(_69||new Date()).getDay();if(_6b.end<_6b.start){_6b.end+=7;if(day<_6b.start){day+=7;}}return day>=_6b.start&&day<=_6b.end;};dojo.date.locale._getDayOfYear=function(_6d){return dojo.date.difference(new Date(_6d.getFullYear(),0,1),_6d)+1;};dojo.date.locale._getWeekOfYear=function(_6e,_6f){if(arguments.length==1){_6f=0;}var _70=new Date(_6e.getFullYear(),0,1).getDay();var adj=(_70-_6f+7)%7;var _72=Math.floor((dojo.date.locale._getDayOfYear(_6e)+adj-1)/7);if(_70==_6f){_72++;}return _72;};} \ No newline at end of file +if(!dojo._hasResource["dojo.date.locale"]){dojo._hasResource["dojo.date.locale"]=true;dojo.provide("dojo.date.locale");dojo.require("dojo.date");dojo.require("dojo.cldr.supplemental");dojo.require("dojo.regexp");dojo.require("dojo.string");dojo.require("dojo.i18n");dojo.requireLocalization("dojo.cldr","gregorian",null,"de,en,en-au,en-ca,en-gb,es,es-es,fr,ROOT,it,it-it,ja,ko,ko-kr,pt,pt-br,zh,zh-cn,zh-tw");(function(){function formatPattern(_1,_2,_3,_4){return _4.replace(/([a-z])\1*/ig,function(_5){var s,_7;var c=_5.charAt(0);var l=_5.length;var _a=["abbr","wide","narrow"];switch(c){case "G":s=_2[(l<4)?"eraAbbr":"eraNames"][_1.getFullYear()<0?0:1];break;case "y":s=_1.getFullYear();switch(l){case 1:break;case 2:if(!_3){s=String(s);s=s.substr(s.length-2);break;}default:_7=true;}break;case "Q":case "q":s=Math.ceil((_1.getMonth()+1)/3);_7=true;break;case "M":var m=_1.getMonth();if(l<3){s=m+1;_7=true;}else{var _c=["months","format",_a[l-3]].join("-");s=_2[_c][m];}break;case "w":var _d=0;s=dojo.date.locale._getWeekOfYear(_1,_d);_7=true;break;case "d":s=_1.getDate();_7=true;break;case "D":s=dojo.date.locale._getDayOfYear(_1);_7=true;break;case "E":var d=_1.getDay();if(l<3){s=d+1;_7=true;}else{var _f=["days","format",_a[l-3]].join("-");s=_2[_f][d];}break;case "a":var _10=(_1.getHours()<12)?"am":"pm";s=_2[_10];break;case "h":case "H":case "K":case "k":var h=_1.getHours();switch(c){case "h":s=(h%12)||12;break;case "H":s=h;break;case "K":s=(h%12);break;case "k":s=h||24;break;}_7=true;break;case "m":s=_1.getMinutes();_7=true;break;case "s":s=_1.getSeconds();_7=true;break;case "S":s=Math.round(_1.getMilliseconds()*Math.pow(10,l-3));_7=true;break;case "v":case "z":s=dojo.date.getTimezoneName(_1);if(s){break;}l=4;case "Z":var _12=_1.getTimezoneOffset();var tz=[(_12<=0?"+":"-"),dojo.string.pad(Math.floor(Math.abs(_12)/60),2),dojo.string.pad(Math.abs(_12)%60,2)];if(l==4){tz.splice(0,0,"GMT");tz.splice(3,0,":");}s=tz.join("");break;default:throw new Error("dojo.date.locale.format: invalid pattern char: "+_4);}if(_7){s=dojo.string.pad(s,l);}return s;});};dojo.date.locale.format=function(_14,_15){_15=_15||{};var _16=dojo.i18n.normalizeLocale(_15.locale);var _17=_15.formatLength||"short";var _18=dojo.date.locale._getGregorianBundle(_16);var str=[];var _1a=dojo.hitch(this,formatPattern,_14,_18,_15.fullYear);if(_15.selector=="year"){var _1b=_14.getFullYear();if(_16.match(/^zh|^ja/)){_1b+="年";}return _1b;}if(_15.selector!="time"){var _1c=_15.datePattern||_18["dateFormat-"+_17];if(_1c){str.push(_processPattern(_1c,_1a));}}if(_15.selector!="date"){var _1d=_15.timePattern||_18["timeFormat-"+_17];if(_1d){str.push(_processPattern(_1d,_1a));}}var _1e=str.join(" ");return _1e;};dojo.date.locale.regexp=function(_1f){return dojo.date.locale._parseInfo(_1f).regexp;};dojo.date.locale._parseInfo=function(_20){_20=_20||{};var _21=dojo.i18n.normalizeLocale(_20.locale);var _22=dojo.date.locale._getGregorianBundle(_21);var _23=_20.formatLength||"short";var _24=_20.datePattern||_22["dateFormat-"+_23];var _25=_20.timePattern||_22["timeFormat-"+_23];var _26;if(_20.selector=="date"){_26=_24;}else{if(_20.selector=="time"){_26=_25;}else{_26=_24+" "+_25;}}var _27=[];var re=_processPattern(_26,dojo.hitch(this,_buildDateTimeRE,_27,_22,_20));return {regexp:re,tokens:_27,bundle:_22};};dojo.date.locale.parse=function(_29,_2a){var _2b=dojo.date.locale._parseInfo(_2a);var _2c=_2b.tokens,_2d=_2b.bundle;var re=new RegExp("^"+_2b.regexp+"$",_2b.strict?"":"i");var _2f=re.exec(_29);if(!_2f){return null;}var _30=["abbr","wide","narrow"];var _31=[1970,0,1,0,0,0,0];var _32="";var _33=dojo.every(_2f,function(v,i){if(!i){return true;}var _36=_2c[i-1];var l=_36.length;switch(_36.charAt(0)){case "y":if(l!=2&&_2a.strict){_31[0]=v;}else{if(v<100){v=Number(v);var _38=""+new Date().getFullYear();var _39=_38.substring(0,2)*100;var _3a=Math.min(Number(_38.substring(2,4))+20,99);var num=(v<_3a)?_39+v:_39-100+v;_31[0]=num;}else{if(_2a.strict){return false;}_31[0]=v;}}break;case "M":if(l>2){var _3c=_2d["months-format-"+_30[l-3]].concat();if(!_2a.strict){v=v.replace(".","").toLowerCase();_3c=dojo.map(_3c,function(s){return s.replace(".","").toLowerCase();});}v=dojo.indexOf(_3c,v);if(v==-1){return false;}}else{v--;}_31[1]=v;break;case "E":case "e":var _3e=_2d["days-format-"+_30[l-3]].concat();if(!_2a.strict){v=v.toLowerCase();_3e=dojo.map(_3e,function(d){return d.toLowerCase();});}v=dojo.indexOf(_3e,v);if(v==-1){return false;}break;case "D":_31[1]=0;case "d":_31[2]=v;break;case "a":var am=_2a.am||_2d.am;var pm=_2a.pm||_2d.pm;if(!_2a.strict){var _42=/\./g;v=v.replace(_42,"").toLowerCase();am=am.replace(_42,"").toLowerCase();pm=pm.replace(_42,"").toLowerCase();}if(_2a.strict&&v!=am&&v!=pm){return false;}_32=(v==pm)?"p":(v==am)?"a":"";break;case "K":if(v==24){v=0;}case "h":case "H":case "k":if(v>23){return false;}_31[3]=v;break;case "m":_31[4]=v;break;case "s":_31[5]=v;break;case "S":_31[6]=v;}return true;});var _43=+_31[3];if(_32==="p"&&_43<12){_31[3]=_43+12;}else{if(_32==="a"&&_43==12){_31[3]=0;}}var _44=new Date(_31[0],_31[1],_31[2],_31[3],_31[4],_31[5],_31[6]);if(_2a.strict){_44.setFullYear(_31[0]);}var _45=_2c.join("");if(!_33||(_45.indexOf("M")!=-1&&_44.getMonth()!=_31[1])||(_45.indexOf("d")!=-1&&_44.getDate()!=_31[2])){return null;}return _44;};function _processPattern(_46,_47,_48,_49){var _4a=function(x){return x;};_47=_47||_4a;_48=_48||_4a;_49=_49||_4a;var _4c=_46.match(/(''|[^'])+/g);var _4d=_46.charAt(0)=="'";dojo.forEach(_4c,function(_4e,i){if(!_4e){_4c[i]="";}else{_4c[i]=(_4d?_48:_47)(_4e);_4d=!_4d;}});return _49(_4c.join(""));};function _buildDateTimeRE(_50,_51,_52,_53){_53=dojo.regexp.escapeString(_53);if(!_52.strict){_53=_53.replace(" a"," ?a");}return _53.replace(/([a-z])\1*/ig,function(_54){var s;var c=_54.charAt(0);var l=_54.length;var p2="",p3="";if(_52.strict){if(l>1){p2="0"+"{"+(l-1)+"}";}if(l>2){p3="0"+"{"+(l-2)+"}";}}else{p2="0?";p3="0{0,2}";}switch(c){case "y":s="\\d{2,4}";break;case "M":s=(l>2)?"\\S+?":p2+"[1-9]|1[0-2]";break;case "D":s=p2+"[1-9]|"+p3+"[1-9][0-9]|[12][0-9][0-9]|3[0-5][0-9]|36[0-6]";break;case "d":s="[12]\\d|"+p2+"[1-9]|3[01]";break;case "w":s=p2+"[1-9]|[1-4][0-9]|5[0-3]";break;case "E":s="\\S+";break;case "h":s=p2+"[1-9]|1[0-2]";break;case "k":s=p2+"\\d|1[01]";break;case "H":s=p2+"\\d|1\\d|2[0-3]";break;case "K":s=p2+"[1-9]|1\\d|2[0-4]";break;case "m":case "s":s="[0-5]\\d";break;case "S":s="\\d{"+l+"}";break;case "a":var am=_52.am||_51.am||"AM";var pm=_52.pm||_51.pm||"PM";if(_52.strict){s=am+"|"+pm;}else{s=am+"|"+pm;if(am!=am.toLowerCase()){s+="|"+am.toLowerCase();}if(pm!=pm.toLowerCase()){s+="|"+pm.toLowerCase();}if(s.indexOf(".")!=-1){s+="|"+s.replace(/\./g,"");}}s=s.replace(/\./g,"\\.");break;default:s=".*";}if(_50){_50.push(_54);}return "("+s+")";}).replace(/[\xa0 ]/g,"[\\s\\xa0]");};})();(function(){var _5c=[];dojo.date.locale.addCustomFormats=function(_5d,_5e){_5c.push({pkg:_5d,name:_5e});};dojo.date.locale._getGregorianBundle=function(_5f){var _60={};dojo.forEach(_5c,function(_61){var _62=dojo.i18n.getLocalization(_61.pkg,_61.name,_5f);_60=dojo.mixin(_60,_62);},this);return _60;};})();dojo.date.locale.addCustomFormats("dojo.cldr","gregorian");dojo.date.locale.getNames=function(_63,_64,use,_66){var _67;var _68=dojo.date.locale._getGregorianBundle(_66);var _69=[_63,use,_64];if(use=="standAlone"){var key=_69.join("-");_67=_68[key];if(_67[0]==1){_67=undefined;}}_69[1]="format";return (_67||_68[_69.join("-")]).concat();};dojo.date.locale.isWeekend=function(_6b,_6c){var _6d=dojo.cldr.supplemental.getWeekend(_6c);var day=(_6b||new Date()).getDay();if(_6d.end<_6d.start){_6d.end+=7;if(day<_6d.start){day+=7;}}return day>=_6d.start&&day<=_6d.end;};dojo.date.locale._getDayOfYear=function(_6f){return dojo.date.difference(new Date(_6f.getFullYear(),0,1,_6f.getHours()),_6f)+1;};dojo.date.locale._getWeekOfYear=function(_70,_71){if(arguments.length==1){_71=0;}var _72=new Date(_70.getFullYear(),0,1).getDay();var adj=(_72-_71+7)%7;var _74=Math.floor((dojo.date.locale._getDayOfYear(_70)+adj-1)/7);if(_72==_71){_74++;}return _74;};} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/date/stamp.js b/spring-js/src/main/resources/META-INF/dojo/date/stamp.js index 87025fc0..47e32e39 100644 --- a/spring-js/src/main/resources/META-INF/dojo/date/stamp.js +++ b/spring-js/src/main/resources/META-INF/dojo/date/stamp.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo.date.stamp"]){dojo._hasResource["dojo.date.stamp"]=true;dojo.provide("dojo.date.stamp");dojo.date.stamp.fromISOString=function(_1,_2){if(!dojo.date.stamp._isoRegExp){dojo.date.stamp._isoRegExp=/^(?:(\d{4})(?:-(\d{2})(?:-(\d{2}))?)?)?(?:T(\d{2}):(\d{2})(?::(\d{2})(.\d+)?)?((?:[+-](\d{2}):(\d{2}))|Z)?)?$/;}var _3=dojo.date.stamp._isoRegExp.exec(_1);var _4=null;if(_3){_3.shift();_3[1]&&_3[1]--;_3[6]&&(_3[6]*=1000);if(_2){_2=new Date(_2);dojo.map(["FullYear","Month","Date","Hours","Minutes","Seconds","Milliseconds"],function(_5){return _2["get"+_5]();}).forEach(function(_6,_7){if(_3[_7]===undefined){_3[_7]=_6;}});}_4=new Date(_3[0]||1970,_3[1]||0,_3[2]||0,_3[3]||0,_3[4]||0,_3[5]||0,_3[6]||0);var _8=0;var _9=_3[7]&&_3[7].charAt(0);if(_9!="Z"){_8=((_3[8]||0)*60)+(Number(_3[9])||0);if(_9!="-"){_8*=-1;}}if(_9){_8-=_4.getTimezoneOffset();}if(_8){_4.setTime(_4.getTime()+_8*60000);}}return _4;};dojo.date.stamp.toISOString=function(_a,_b){var _=function(n){return (n<10)?"0"+n:n;};_b=_b||{};var _e=[];var _f=_b.zulu?"getUTC":"get";var _10="";if(_b.selector!="time"){_10=[_a[_f+"FullYear"](),_(_a[_f+"Month"]()+1),_(_a[_f+"Date"]())].join("-");}_e.push(_10);if(_b.selector!="date"){var _11=[_(_a[_f+"Hours"]()),_(_a[_f+"Minutes"]()),_(_a[_f+"Seconds"]())].join(":");var _12=_a[_f+"Milliseconds"]();if(_b.milliseconds){_11+="."+(_12<100?"0":"")+_(_12);}if(_b.zulu){_11+="Z";}else{if(_b.selector!="time"){var _13=_a.getTimezoneOffset();var _14=Math.abs(_13);_11+=(_13>0?"-":"+")+_(Math.floor(_14/60))+":"+_(_14%60);}}_e.push(_11);}return _e.join("T");};} \ No newline at end of file +if(!dojo._hasResource["dojo.date.stamp"]){dojo._hasResource["dojo.date.stamp"]=true;dojo.provide("dojo.date.stamp");dojo.date.stamp.fromISOString=function(_1,_2){if(!dojo.date.stamp._isoRegExp){dojo.date.stamp._isoRegExp=/^(?:(\d{4})(?:-(\d{2})(?:-(\d{2}))?)?)?(?:T(\d{2}):(\d{2})(?::(\d{2})(.\d+)?)?((?:[+-](\d{2}):(\d{2}))|Z)?)?$/;}var _3=dojo.date.stamp._isoRegExp.exec(_1);var _4=null;if(_3){_3.shift();if(_3[1]){_3[1]--;}if(_3[6]){_3[6]*=1000;}if(_2){_2=new Date(_2);dojo.map(["FullYear","Month","Date","Hours","Minutes","Seconds","Milliseconds"],function(_5){return _2["get"+_5]();}).forEach(function(_6,_7){if(_3[_7]===undefined){_3[_7]=_6;}});}_4=new Date(_3[0]||1970,_3[1]||0,_3[2]||1,_3[3]||0,_3[4]||0,_3[5]||0,_3[6]||0);var _8=0;var _9=_3[7]&&_3[7].charAt(0);if(_9!="Z"){_8=((_3[8]||0)*60)+(Number(_3[9])||0);if(_9!="-"){_8*=-1;}}if(_9){_8-=_4.getTimezoneOffset();}if(_8){_4.setTime(_4.getTime()+_8*60000);}}return _4;};dojo.date.stamp.toISOString=function(_a,_b){var _=function(n){return (n<10)?"0"+n:n;};_b=_b||{};var _e=[];var _f=_b.zulu?"getUTC":"get";var _10="";if(_b.selector!="time"){var _11=_a[_f+"FullYear"]();_10=["0000".substr((_11+"").length)+_11,_(_a[_f+"Month"]()+1),_(_a[_f+"Date"]())].join("-");}_e.push(_10);if(_b.selector!="date"){var _12=[_(_a[_f+"Hours"]()),_(_a[_f+"Minutes"]()),_(_a[_f+"Seconds"]())].join(":");var _13=_a[_f+"Milliseconds"]();if(_b.milliseconds){_12+="."+(_13<100?"0":"")+_(_13);}if(_b.zulu){_12+="Z";}else{if(_b.selector!="time"){var _14=_a.getTimezoneOffset();var _15=Math.abs(_14);_12+=(_14>0?"-":"+")+_(Math.floor(_15/60))+":"+_(_15%60);}}_e.push(_12);}return _e.join("T");};} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/dnd/Avatar.js b/spring-js/src/main/resources/META-INF/dojo/dnd/Avatar.js index 81b9ab0e..f0df6a1e 100644 --- a/spring-js/src/main/resources/META-INF/dojo/dnd/Avatar.js +++ b/spring-js/src/main/resources/META-INF/dojo/dnd/Avatar.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo.dnd.Avatar"]){dojo._hasResource["dojo.dnd.Avatar"]=true;dojo.provide("dojo.dnd.Avatar");dojo.require("dojo.dnd.common");dojo.dnd.Avatar=function(_1){this.manager=_1;this.construct();};dojo.extend(dojo.dnd.Avatar,{construct:function(){var a=dojo.doc.createElement("table");a.className="dojoDndAvatar";a.style.position="absolute";a.style.zIndex=1999;a.style.margin="0px";var b=dojo.doc.createElement("tbody");var tr=dojo.doc.createElement("tr");tr.className="dojoDndAvatarHeader";var td=dojo.doc.createElement("td");td.innerHTML=this._generateText();tr.appendChild(td);dojo.style(tr,"opacity",0.9);b.appendChild(tr);var k=Math.min(5,this.manager.nodes.length);var _7=this.manager.source;for(var i=0;i= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo.dnd.Container"]){dojo._hasResource["dojo.dnd.Container"]=true;dojo.provide("dojo.dnd.Container");dojo.require("dojo.dnd.common");dojo.require("dojo.parser");dojo.declare("dojo.dnd.Container",null,{skipForm:false,constructor:function(_1,_2){this.node=dojo.byId(_1);if(!_2){_2={};}this.creator=_2.creator||null;this.skipForm=_2.skipForm;this.defaultCreator=dojo.dnd._defaultCreator(this.node);this.map={};this.current=null;this.containerState="";dojo.addClass(this.node,"dojoDndContainer");if(!(_2&&_2._skipStartup)){this.startup();}this.events=[dojo.connect(this.node,"onmouseover",this,"onMouseOver"),dojo.connect(this.node,"onmouseout",this,"onMouseOut"),dojo.connect(this.node,"ondragstart",this,"onSelectStart"),dojo.connect(this.node,"onselectstart",this,"onSelectStart")];},creator:function(){},getItem:function(_3){return this.map[_3];},setItem:function(_4,_5){this.map[_4]=_5;},delItem:function(_6){delete this.map[_6];},forInItems:function(f,o){o=o||dojo.global;var m=this.map,e=dojo.dnd._empty;for(var i in this.map){if(i in e){continue;}f.call(o,m[i],i,m);}},clearItems:function(){this.map={};},getAllNodes:function(){return dojo.query("> .dojoDndItem",this.parent);},insertNodes:function(_c,_d,_e){if(!this.parent.firstChild){_e=null;}else{if(_d){if(!_e){_e=this.parent.firstChild;}}else{if(_e){_e=_e.nextSibling;}}}if(_e){for(var i=0;i<_c.length;++i){var t=this._normalizedCreator(_c[i]);this.setItem(t.node.id,{data:t.data,type:t.type});this.parent.insertBefore(t.node,_e);}}else{for(var i=0;i<_c.length;++i){var t=this._normalizedCreator(_c[i]);this.setItem(t.node.id,{data:t.data,type:t.type});this.parent.appendChild(t.node);}}return this;},destroy:function(){dojo.forEach(this.events,dojo.disconnect);this.clearItems();this.node=this.parent=this.current;},markupFactory:function(_11,_12){_11._skipStartup=true;return new dojo.dnd.Container(_12,_11);},startup:function(){this.parent=this.node;if(this.parent.tagName.toLowerCase()=="table"){var c=this.parent.getElementsByTagName("tbody");if(c&&c.length){this.parent=c[0];}}dojo.query("> .dojoDndItem",this.parent).forEach(function(_14){if(!_14.id){_14.id=dojo.dnd.getUniqueId();}var _15=_14.getAttribute("dndType"),_16=_14.getAttribute("dndData");this.setItem(_14.id,{data:_16?_16:_14.innerHTML,type:_15?_15.split(/\s*,\s*/):["text"]});},this);},onMouseOver:function(e){var n=e.relatedTarget;while(n){if(n==this.node){break;}try{n=n.parentNode;}catch(x){n=null;}}if(!n){this._changeState("Container","Over");this.onOverEvent();}n=this._getChildByEvent(e);if(this.current==n){return;}if(this.current){this._removeItemClass(this.current,"Over");}if(n){this._addItemClass(n,"Over");}this.current=n;},onMouseOut:function(e){for(var n=e.relatedTarget;n;){if(n==this.node){return;}try{n=n.parentNode;}catch(x){n=null;}}if(this.current){this._removeItemClass(this.current,"Over");this.current=null;}this._changeState("Container","");this.onOutEvent();},onSelectStart:function(e){if(!this.skipForm||!dojo.dnd.isFormElement(e)){dojo.stopEvent(e);}},onOverEvent:function(){},onOutEvent:function(){},_changeState:function(_1c,_1d){var _1e="dojoDnd"+_1c;var _1f=_1c.toLowerCase()+"State";dojo.removeClass(this.node,_1e+this[_1f]);dojo.addClass(this.node,_1e+_1d);this[_1f]=_1d;},_addItemClass:function(_20,_21){dojo.addClass(_20,"dojoDndItem"+_21);},_removeItemClass:function(_22,_23){dojo.removeClass(_22,"dojoDndItem"+_23);},_getChildByEvent:function(e){var _25=e.target;if(_25){for(var _26=_25.parentNode;_26;_25=_26,_26=_25.parentNode){if(_26==this.parent&&dojo.hasClass(_25,"dojoDndItem")){return _25;}}}return null;},_normalizedCreator:function(_27,_28){var t=(this.creator?this.creator:this.defaultCreator)(_27,_28);if(!dojo.isArray(t.type)){t.type=["text"];}if(!t.node.id){t.node.id=dojo.dnd.getUniqueId();}dojo.addClass(t.node,"dojoDndItem");return t;}});dojo.dnd._createNode=function(tag){if(!tag){return dojo.dnd._createSpan;}return function(_2b){var n=dojo.doc.createElement(tag);n.innerHTML=_2b;return n;};};dojo.dnd._createTrTd=function(_2d){var tr=dojo.doc.createElement("tr");var td=dojo.doc.createElement("td");td.innerHTML=_2d;tr.appendChild(td);return tr;};dojo.dnd._createSpan=function(_30){var n=dojo.doc.createElement("span");n.innerHTML=_30;return n;};dojo.dnd._defaultCreatorNodes={ul:"li",ol:"li",div:"div",p:"div"};dojo.dnd._defaultCreator=function(_32){var tag=_32.tagName.toLowerCase();var c=tag=="table"?dojo.dnd._createTrTd:dojo.dnd._createNode(dojo.dnd._defaultCreatorNodes[tag]);return function(_35,_36){var _37=dojo.isObject(_35)&&_35;var _38=(_37&&_35.data)?_35.data:_35;var _39=(_37&&_35.type)?_35.type:["text"];var t=String(_38),n=(_36=="avatar"?dojo.dnd._createSpan:c)(t);n.id=dojo.dnd.getUniqueId();return {node:n,data:_38,type:_39};};};} \ No newline at end of file +if(!dojo._hasResource["dojo.dnd.Container"]){dojo._hasResource["dojo.dnd.Container"]=true;dojo.provide("dojo.dnd.Container");dojo.require("dojo.dnd.common");dojo.require("dojo.parser");dojo.declare("dojo.dnd.Container",null,{skipForm:false,constructor:function(_1,_2){this.node=dojo.byId(_1);if(!_2){_2={};}this.creator=_2.creator||null;this.skipForm=_2.skipForm;this.parent=_2.dropParent&&dojo.byId(_2.dropParent);this.map={};this.current=null;this.containerState="";dojo.addClass(this.node,"dojoDndContainer");if(!(_2&&_2._skipStartup)){this.startup();}this.events=[dojo.connect(this.node,"onmouseover",this,"onMouseOver"),dojo.connect(this.node,"onmouseout",this,"onMouseOut"),dojo.connect(this.node,"ondragstart",this,"onSelectStart"),dojo.connect(this.node,"onselectstart",this,"onSelectStart")];},creator:function(){},getItem:function(_3){return this.map[_3];},setItem:function(_4,_5){this.map[_4]=_5;},delItem:function(_6){delete this.map[_6];},forInItems:function(f,o){o=o||dojo.global;var m=this.map,e=dojo.dnd._empty;for(var i in m){if(i in e){continue;}f.call(o,m[i],i,this);}return o;},clearItems:function(){this.map={};},getAllNodes:function(){return dojo.query("> .dojoDndItem",this.parent);},sync:function(){var _c={};this.getAllNodes().forEach(function(_d){if(_d.id){var _e=this.getItem(_d.id);if(_e){_c[_d.id]=_e;return;}}else{_d.id=dojo.dnd.getUniqueId();}var _f=_d.getAttribute("dndType"),_10=_d.getAttribute("dndData");_c[_d.id]={data:_10||_d.innerHTML,type:_f?_f.split(/\s*,\s*/):["text"]};},this);this.map=_c;return this;},insertNodes:function(_11,_12,_13){if(!this.parent.firstChild){_13=null;}else{if(_12){if(!_13){_13=this.parent.firstChild;}}else{if(_13){_13=_13.nextSibling;}}}if(_13){for(var i=0;i<_11.length;++i){var t=this._normalizedCreator(_11[i]);this.setItem(t.node.id,{data:t.data,type:t.type});this.parent.insertBefore(t.node,_13);}}else{for(var i=0;i<_11.length;++i){var t=this._normalizedCreator(_11[i]);this.setItem(t.node.id,{data:t.data,type:t.type});this.parent.appendChild(t.node);}}return this;},destroy:function(){dojo.forEach(this.events,dojo.disconnect);this.clearItems();this.node=this.parent=this.current=null;},markupFactory:function(_16,_17){_16._skipStartup=true;return new dojo.dnd.Container(_17,_16);},startup:function(){if(!this.parent){this.parent=this.node;if(this.parent.tagName.toLowerCase()=="table"){var c=this.parent.getElementsByTagName("tbody");if(c&&c.length){this.parent=c[0];}}}this.defaultCreator=dojo.dnd._defaultCreator(this.parent);this.sync();},onMouseOver:function(e){var n=e.relatedTarget;while(n){if(n==this.node){break;}try{n=n.parentNode;}catch(x){n=null;}}if(!n){this._changeState("Container","Over");this.onOverEvent();}n=this._getChildByEvent(e);if(this.current==n){return;}if(this.current){this._removeItemClass(this.current,"Over");}if(n){this._addItemClass(n,"Over");}this.current=n;},onMouseOut:function(e){for(var n=e.relatedTarget;n;){if(n==this.node){return;}try{n=n.parentNode;}catch(x){n=null;}}if(this.current){this._removeItemClass(this.current,"Over");this.current=null;}this._changeState("Container","");this.onOutEvent();},onSelectStart:function(e){if(!this.skipForm||!dojo.dnd.isFormElement(e)){dojo.stopEvent(e);}},onOverEvent:function(){},onOutEvent:function(){},_changeState:function(_1e,_1f){var _20="dojoDnd"+_1e;var _21=_1e.toLowerCase()+"State";dojo.removeClass(this.node,_20+this[_21]);dojo.addClass(this.node,_20+_1f);this[_21]=_1f;},_addItemClass:function(_22,_23){dojo.addClass(_22,"dojoDndItem"+_23);},_removeItemClass:function(_24,_25){dojo.removeClass(_24,"dojoDndItem"+_25);},_getChildByEvent:function(e){var _27=e.target;if(_27){for(var _28=_27.parentNode;_28;_27=_28,_28=_27.parentNode){if(_28==this.parent&&dojo.hasClass(_27,"dojoDndItem")){return _27;}}}return null;},_normalizedCreator:function(_29,_2a){var t=(this.creator||this.defaultCreator).call(this,_29,_2a);if(!dojo.isArray(t.type)){t.type=["text"];}if(!t.node.id){t.node.id=dojo.dnd.getUniqueId();}dojo.addClass(t.node,"dojoDndItem");return t;}});dojo.dnd._createNode=function(tag){if(!tag){return dojo.dnd._createSpan;}return function(_2d){var n=dojo.doc.createElement(tag);n.innerHTML=_2d;return n;};};dojo.dnd._createTrTd=function(_2f){var tr=dojo.doc.createElement("tr");var td=dojo.doc.createElement("td");td.innerHTML=_2f;tr.appendChild(td);return tr;};dojo.dnd._createSpan=function(_32){var n=dojo.doc.createElement("span");n.innerHTML=_32;return n;};dojo.dnd._defaultCreatorNodes={ul:"li",ol:"li",div:"div",p:"div"};dojo.dnd._defaultCreator=function(_34){var tag=_34.tagName.toLowerCase();var c=tag=="tbody"||tag=="thead"?dojo.dnd._createTrTd:dojo.dnd._createNode(dojo.dnd._defaultCreatorNodes[tag]);return function(_37,_38){var _39=_37&&dojo.isObject(_37),_3a,_3b,n;if(_39&&_37.tagName&&_37.nodeType&&_37.getAttribute){_3a=_37.getAttribute("dndData")||_37.innerHTML;_3b=_37.getAttribute("dndType");_3b=_3b?_3b.split(/\s*,\s*/):["text"];n=_37;}else{_3a=(_39&&_37.data)?_37.data:_37;_3b=(_39&&_37.type)?_37.type:["text"];n=(_38=="avatar"?dojo.dnd._createSpan:c)(String(_3a));}n.id=dojo.dnd.getUniqueId();return {node:n,data:_3a,type:_3b};};};} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/dnd/Manager.js b/spring-js/src/main/resources/META-INF/dojo/dnd/Manager.js index c5916572..1b183fcc 100644 --- a/spring-js/src/main/resources/META-INF/dojo/dnd/Manager.js +++ b/spring-js/src/main/resources/META-INF/dojo/dnd/Manager.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo.dnd.Manager"]){dojo._hasResource["dojo.dnd.Manager"]=true;dojo.provide("dojo.dnd.Manager");dojo.require("dojo.dnd.common");dojo.require("dojo.dnd.autoscroll");dojo.require("dojo.dnd.Avatar");dojo.dnd.Manager=function(){this.avatar=null;this.source=null;this.nodes=[];this.copy=true;this.target=null;this.canDropFlag=false;this.events=[];};dojo.extend(dojo.dnd.Manager,{OFFSET_X:16,OFFSET_Y:16,overSource:function(_1){if(this.avatar){this.target=(_1&&_1.targetState!="Disabled")?_1:null;this.avatar.update();}dojo.publish("/dnd/source/over",[_1]);},outSource:function(_2){if(this.avatar){if(this.target==_2){this.target=null;this.canDropFlag=false;this.avatar.update();dojo.publish("/dnd/source/over",[null]);}}else{dojo.publish("/dnd/source/over",[null]);}},startDrag:function(_3,_4,_5){this.source=_3;this.nodes=_4;this.copy=Boolean(_5);this.avatar=this.makeAvatar();dojo.body().appendChild(this.avatar.node);dojo.publish("/dnd/start",[_3,_4,this.copy]);this.events=[dojo.connect(dojo.doc,"onmousemove",this,"onMouseMove"),dojo.connect(dojo.doc,"onmouseup",this,"onMouseUp"),dojo.connect(dojo.doc,"onkeydown",this,"onKeyDown"),dojo.connect(dojo.doc,"onkeyup",this,"onKeyUp")];var c="dojoDnd"+(_5?"Copy":"Move");dojo.addClass(dojo.body(),c);},canDrop:function(_7){var _8=this.target&&_7;if(this.canDropFlag!=_8){this.canDropFlag=_8;this.avatar.update();}},stopDrag:function(){dojo.removeClass(dojo.body(),"dojoDndCopy");dojo.removeClass(dojo.body(),"dojoDndMove");dojo.forEach(this.events,dojo.disconnect);this.events=[];this.avatar.destroy();this.avatar=null;this.source=null;this.nodes=[];},makeAvatar:function(){return new dojo.dnd.Avatar(this);},updateAvatar:function(){this.avatar.update();},onMouseMove:function(e){var a=this.avatar;if(a){dojo.dnd.autoScroll(e);dojo.marginBox(a.node,{l:e.pageX+this.OFFSET_X,t:e.pageY+this.OFFSET_Y});var _b=Boolean(this.source.copyState(dojo.dnd.getCopyKeyState(e)));if(this.copy!=_b){this._setCopyStatus(_b);}}},onMouseUp:function(e){if(this.avatar&&(!("mouseButton" in this.source)||this.source.mouseButton==e.button)){if(this.target&&this.canDropFlag){var _d=[this.source,this.nodes,Boolean(this.source.copyState(dojo.dnd.getCopyKeyState(e))),this.target];dojo.publish("/dnd/drop/before",_d);dojo.publish("/dnd/drop",_d);}else{dojo.publish("/dnd/cancel");}this.stopDrag();}},onKeyDown:function(e){if(this.avatar){switch(e.keyCode){case dojo.keys.CTRL:var _f=Boolean(this.source.copyState(true));if(this.copy!=_f){this._setCopyStatus(_f);}break;case dojo.keys.ESCAPE:dojo.publish("/dnd/cancel");this.stopDrag();break;}}},onKeyUp:function(e){if(this.avatar&&e.keyCode==dojo.keys.CTRL){var _11=Boolean(this.source.copyState(false));if(this.copy!=_11){this._setCopyStatus(_11);}}},_setCopyStatus:function(_12){this.copy=_12;this.source._markDndStatus(this.copy);this.updateAvatar();dojo.removeClass(dojo.body(),"dojoDnd"+(this.copy?"Move":"Copy"));dojo.addClass(dojo.body(),"dojoDnd"+(this.copy?"Copy":"Move"));}});dojo.dnd._manager=null;dojo.dnd.manager=function(){if(!dojo.dnd._manager){dojo.dnd._manager=new dojo.dnd.Manager();}return dojo.dnd._manager;};} \ No newline at end of file +if(!dojo._hasResource["dojo.dnd.Manager"]){dojo._hasResource["dojo.dnd.Manager"]=true;dojo.provide("dojo.dnd.Manager");dojo.require("dojo.dnd.common");dojo.require("dojo.dnd.autoscroll");dojo.require("dojo.dnd.Avatar");dojo.declare("dojo.dnd.Manager",null,{constructor:function(){this.avatar=null;this.source=null;this.nodes=[];this.copy=true;this.target=null;this.canDropFlag=false;this.events=[];},OFFSET_X:16,OFFSET_Y:16,overSource:function(_1){if(this.avatar){this.target=(_1&&_1.targetState!="Disabled")?_1:null;this.canDropFlag=Boolean(this.target);this.avatar.update();}dojo.publish("/dnd/source/over",[_1]);},outSource:function(_2){if(this.avatar){if(this.target==_2){this.target=null;this.canDropFlag=false;this.avatar.update();dojo.publish("/dnd/source/over",[null]);}}else{dojo.publish("/dnd/source/over",[null]);}},startDrag:function(_3,_4,_5){this.source=_3;this.nodes=_4;this.copy=Boolean(_5);this.avatar=this.makeAvatar();dojo.body().appendChild(this.avatar.node);dojo.publish("/dnd/start",[_3,_4,this.copy]);this.events=[dojo.connect(dojo.doc,"onmousemove",this,"onMouseMove"),dojo.connect(dojo.doc,"onmouseup",this,"onMouseUp"),dojo.connect(dojo.doc,"onkeydown",this,"onKeyDown"),dojo.connect(dojo.doc,"onkeyup",this,"onKeyUp")];var c="dojoDnd"+(_5?"Copy":"Move");dojo.addClass(dojo.body(),c);},canDrop:function(_7){var _8=Boolean(this.target&&_7);if(this.canDropFlag!=_8){this.canDropFlag=_8;this.avatar.update();}},stopDrag:function(){dojo.removeClass(dojo.body(),"dojoDndCopy");dojo.removeClass(dojo.body(),"dojoDndMove");dojo.forEach(this.events,dojo.disconnect);this.events=[];this.avatar.destroy();this.avatar=null;this.source=this.target=null;this.nodes=[];},makeAvatar:function(){return new dojo.dnd.Avatar(this);},updateAvatar:function(){this.avatar.update();},onMouseMove:function(e){var a=this.avatar;if(a){dojo.dnd.autoScrollNodes(e);var s=a.node.style;s.left=(e.pageX+this.OFFSET_X)+"px";s.top=(e.pageY+this.OFFSET_Y)+"px";var _c=Boolean(this.source.copyState(dojo.dnd.getCopyKeyState(e)));if(this.copy!=_c){this._setCopyStatus(_c);}}},onMouseUp:function(e){if(this.avatar&&(!("mouseButton" in this.source)||(dojo.isSafari&&dojo.dnd._isMac&&this.source.mouseButton==2?e.button==0:this.source.mouseButton==e.button))){if(this.target&&this.canDropFlag){var _e=Boolean(this.source.copyState(dojo.dnd.getCopyKeyState(e))),_f=[this.source,this.nodes,_e,this.target];dojo.publish("/dnd/drop/before",_f);dojo.publish("/dnd/drop",_f);}else{dojo.publish("/dnd/cancel");}this.stopDrag();}},onKeyDown:function(e){if(this.avatar){switch(e.keyCode){case dojo.keys.CTRL:var _11=Boolean(this.source.copyState(true));if(this.copy!=_11){this._setCopyStatus(_11);}break;case dojo.keys.ESCAPE:dojo.publish("/dnd/cancel");this.stopDrag();break;}}},onKeyUp:function(e){if(this.avatar&&e.keyCode==dojo.keys.CTRL){var _13=Boolean(this.source.copyState(false));if(this.copy!=_13){this._setCopyStatus(_13);}}},_setCopyStatus:function(_14){this.copy=_14;this.source._markDndStatus(this.copy);this.updateAvatar();dojo.removeClass(dojo.body(),"dojoDnd"+(this.copy?"Move":"Copy"));dojo.addClass(dojo.body(),"dojoDnd"+(this.copy?"Copy":"Move"));}});dojo.dnd._manager=null;dojo.dnd.manager=function(){if(!dojo.dnd._manager){dojo.dnd._manager=new dojo.dnd.Manager();}return dojo.dnd._manager;};} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/dnd/Moveable.js b/spring-js/src/main/resources/META-INF/dojo/dnd/Moveable.js index e81737d5..320ab7bb 100644 --- a/spring-js/src/main/resources/META-INF/dojo/dnd/Moveable.js +++ b/spring-js/src/main/resources/META-INF/dojo/dnd/Moveable.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo.dnd.Moveable"]){dojo._hasResource["dojo.dnd.Moveable"]=true;dojo.provide("dojo.dnd.Moveable");dojo.require("dojo.dnd.Mover");dojo.declare("dojo.dnd.Moveable",null,{handle:"",delay:0,skip:false,constructor:function(_1,_2){this.node=dojo.byId(_1);if(!_2){_2={};}this.handle=_2.handle?dojo.byId(_2.handle):null;if(!this.handle){this.handle=this.node;}this.delay=_2.delay>0?_2.delay:0;this.skip=_2.skip;this.mover=_2.mover?_2.mover:dojo.dnd.Mover;this.events=[dojo.connect(this.handle,"onmousedown",this,"onMouseDown"),dojo.connect(this.handle,"ondragstart",this,"onSelectStart"),dojo.connect(this.handle,"onselectstart",this,"onSelectStart")];},markupFactory:function(_3,_4){return new dojo.dnd.Moveable(_4,_3);},destroy:function(){dojo.forEach(this.events,dojo.disconnect);this.events=this.node=this.handle=null;},onMouseDown:function(e){if(this.skip&&dojo.dnd.isFormElement(e)){return;}if(this.delay){this.events.push(dojo.connect(this.handle,"onmousemove",this,"onMouseMove"));this.events.push(dojo.connect(this.handle,"onmouseup",this,"onMouseUp"));this._lastX=e.pageX;this._lastY=e.pageY;}else{new this.mover(this.node,e,this);}dojo.stopEvent(e);},onMouseMove:function(e){if(Math.abs(e.pageX-this._lastX)>this.delay||Math.abs(e.pageY-this._lastY)>this.delay){this.onMouseUp(e);new this.mover(this.node,e,this);}dojo.stopEvent(e);},onMouseUp:function(e){dojo.disconnect(this.events.pop());dojo.disconnect(this.events.pop());},onSelectStart:function(e){if(!this.skip||!dojo.dnd.isFormElement(e)){dojo.stopEvent(e);}},onMoveStart:function(_9){dojo.publish("/dnd/move/start",[_9]);dojo.addClass(dojo.body(),"dojoMove");dojo.addClass(this.node,"dojoMoveItem");},onMoveStop:function(_a){dojo.publish("/dnd/move/stop",[_a]);dojo.removeClass(dojo.body(),"dojoMove");dojo.removeClass(this.node,"dojoMoveItem");},onFirstMove:function(_b){},onMove:function(_c,_d){this.onMoving(_c,_d);dojo.marginBox(_c.node,_d);this.onMoved(_c,_d);},onMoving:function(_e,_f){},onMoved:function(_10,_11){}});} \ No newline at end of file +if(!dojo._hasResource["dojo.dnd.Moveable"]){dojo._hasResource["dojo.dnd.Moveable"]=true;dojo.provide("dojo.dnd.Moveable");dojo.require("dojo.dnd.Mover");dojo.declare("dojo.dnd.Moveable",null,{handle:"",delay:0,skip:false,constructor:function(_1,_2){this.node=dojo.byId(_1);if(!_2){_2={};}this.handle=_2.handle?dojo.byId(_2.handle):null;if(!this.handle){this.handle=this.node;}this.delay=_2.delay>0?_2.delay:0;this.skip=_2.skip;this.mover=_2.mover?_2.mover:dojo.dnd.Mover;this.events=[dojo.connect(this.handle,"onmousedown",this,"onMouseDown"),dojo.connect(this.handle,"ondragstart",this,"onSelectStart"),dojo.connect(this.handle,"onselectstart",this,"onSelectStart")];},markupFactory:function(_3,_4){return new dojo.dnd.Moveable(_4,_3);},destroy:function(){dojo.forEach(this.events,dojo.disconnect);this.events=this.node=this.handle=null;},onMouseDown:function(e){if(this.skip&&dojo.dnd.isFormElement(e)){return;}if(this.delay){this.events.push(dojo.connect(this.handle,"onmousemove",this,"onMouseMove"));this.events.push(dojo.connect(this.handle,"onmouseup",this,"onMouseUp"));this._lastX=e.pageX;this._lastY=e.pageY;}else{this.onDragDetected(e);}dojo.stopEvent(e);},onMouseMove:function(e){if(Math.abs(e.pageX-this._lastX)>this.delay||Math.abs(e.pageY-this._lastY)>this.delay){this.onMouseUp(e);this.onDragDetected(e);}dojo.stopEvent(e);},onMouseUp:function(e){dojo.disconnect(this.events.pop());dojo.disconnect(this.events.pop());dojo.stopEvent(e);},onSelectStart:function(e){if(!this.skip||!dojo.dnd.isFormElement(e)){dojo.stopEvent(e);}},onDragDetected:function(e){new this.mover(this.node,e,this);},onMoveStart:function(_a){dojo.publish("/dnd/move/start",[_a]);dojo.addClass(dojo.body(),"dojoMove");dojo.addClass(this.node,"dojoMoveItem");},onMoveStop:function(_b){dojo.publish("/dnd/move/stop",[_b]);dojo.removeClass(dojo.body(),"dojoMove");dojo.removeClass(this.node,"dojoMoveItem");},onFirstMove:function(_c){},onMove:function(_d,_e){this.onMoving(_d,_e);var s=_d.node.style;s.left=_e.l+"px";s.top=_e.t+"px";this.onMoved(_d,_e);},onMoving:function(_10,_11){},onMoved:function(_12,_13){}});} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/dnd/Mover.js b/spring-js/src/main/resources/META-INF/dojo/dnd/Mover.js index b67811c6..ce98e83e 100644 --- a/spring-js/src/main/resources/META-INF/dojo/dnd/Mover.js +++ b/spring-js/src/main/resources/META-INF/dojo/dnd/Mover.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo.dnd.Mover"]){dojo._hasResource["dojo.dnd.Mover"]=true;dojo.provide("dojo.dnd.Mover");dojo.require("dojo.dnd.common");dojo.require("dojo.dnd.autoscroll");dojo.declare("dojo.dnd.Mover",null,{constructor:function(_1,e,_3){this.node=dojo.byId(_1);this.marginBox={l:e.pageX,t:e.pageY};this.mouseButton=e.button;var h=this.host=_3,d=_1.ownerDocument,_6=dojo.connect(d,"onmousemove",this,"onFirstMove");this.events=[dojo.connect(d,"onmousemove",this,"onMouseMove"),dojo.connect(d,"onmouseup",this,"onMouseUp"),dojo.connect(d,"ondragstart",dojo,"stopEvent"),dojo.connect(d,"onselectstart",dojo,"stopEvent"),_6];if(h&&h.onMoveStart){h.onMoveStart(this);}},onMouseMove:function(e){dojo.dnd.autoScroll(e);var m=this.marginBox;this.host.onMove(this,{l:m.l+e.pageX,t:m.t+e.pageY});},onMouseUp:function(e){if(this.mouseButton==e.button){this.destroy();}},onFirstMove:function(){this.node.style.position="absolute";var m=dojo.marginBox(this.node);m.l-=this.marginBox.l;m.t-=this.marginBox.t;this.marginBox=m;this.host.onFirstMove(this);dojo.disconnect(this.events.pop());},destroy:function(){dojo.forEach(this.events,dojo.disconnect);var h=this.host;if(h&&h.onMoveStop){h.onMoveStop(this);}this.events=this.node=null;}});} \ No newline at end of file +if(!dojo._hasResource["dojo.dnd.Mover"]){dojo._hasResource["dojo.dnd.Mover"]=true;dojo.provide("dojo.dnd.Mover");dojo.require("dojo.dnd.common");dojo.require("dojo.dnd.autoscroll");dojo.declare("dojo.dnd.Mover",null,{constructor:function(_1,e,_3){this.node=dojo.byId(_1);this.marginBox={l:e.pageX,t:e.pageY};this.mouseButton=e.button;var h=this.host=_3,d=_1.ownerDocument,_6=dojo.connect(d,"onmousemove",this,"onFirstMove");this.events=[dojo.connect(d,"onmousemove",this,"onMouseMove"),dojo.connect(d,"onmouseup",this,"onMouseUp"),dojo.connect(d,"ondragstart",dojo,"stopEvent"),dojo.connect(d,"onselectstart",dojo,"stopEvent"),_6];if(h&&h.onMoveStart){h.onMoveStart(this);}},onMouseMove:function(e){dojo.dnd.autoScroll(e);var m=this.marginBox;this.host.onMove(this,{l:m.l+e.pageX,t:m.t+e.pageY});dojo.stopEvent(e);},onMouseUp:function(e){if(dojo.isSafari&&dojo.dnd._isMac&&this.mouseButton==2?e.button==0:this.mouseButton==e.button){this.destroy();}dojo.stopEvent(e);},onFirstMove:function(){var s=this.node.style,l,t,h=this.host;switch(s.position){case "relative":case "absolute":l=Math.round(parseFloat(s.left));t=Math.round(parseFloat(s.top));break;default:s.position="absolute";var m=dojo.marginBox(this.node);var b=dojo.doc.body;var bs=dojo.getComputedStyle(b);var bm=dojo._getMarginBox(b,bs);var bc=dojo._getContentBox(b,bs);l=m.l-(bc.l-bm.l);t=m.t-(bc.t-bm.t);break;}this.marginBox.l=l-this.marginBox.l;this.marginBox.t=t-this.marginBox.t;if(h&&h.onFirstMove){h.onFirstMove(this);}dojo.disconnect(this.events.pop());},destroy:function(){dojo.forEach(this.events,dojo.disconnect);var h=this.host;if(h&&h.onMoveStop){h.onMoveStop(this);}this.events=this.node=this.host=null;}});} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/dnd/Selector.js b/spring-js/src/main/resources/META-INF/dojo/dnd/Selector.js index b0aee2dc..408a651d 100644 --- a/spring-js/src/main/resources/META-INF/dojo/dnd/Selector.js +++ b/spring-js/src/main/resources/META-INF/dojo/dnd/Selector.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo.dnd.Selector"]){dojo._hasResource["dojo.dnd.Selector"]=true;dojo.provide("dojo.dnd.Selector");dojo.require("dojo.dnd.common");dojo.require("dojo.dnd.Container");dojo.declare("dojo.dnd.Selector",dojo.dnd.Container,{constructor:function(_1,_2){if(!_2){_2={};}this.singular=_2.singular;this.selection={};this.anchor=null;this.simpleSelection=false;this.events.push(dojo.connect(this.node,"onmousedown",this,"onMouseDown"),dojo.connect(this.node,"onmouseup",this,"onMouseUp"));},singular:false,getSelectedNodes:function(){var t=new dojo.NodeList();var e=dojo.dnd._empty;for(var i in this.selection){if(i in e){continue;}t.push(dojo.byId(i));}return t;},selectNone:function(){return this._removeSelection()._removeAnchor();},selectAll:function(){this.forInItems(function(_6,id){this._addItemClass(dojo.byId(id),"Selected");this.selection[id]=1;},this);return this._removeAnchor();},deleteSelectedNodes:function(){var e=dojo.dnd._empty;for(var i in this.selection){if(i in e){continue;}var n=dojo.byId(i);this.delItem(i);dojo._destroyElement(n);}this.anchor=null;this.selection={};return this;},insertNodes:function(_b,_c,_d,_e){var _f=this._normalizedCreator;this._normalizedCreator=function(_10,_11){var t=_f.call(this,_10,_11);if(_b){if(!this.anchor){this.anchor=t.node;this._removeItemClass(t.node,"Selected");this._addItemClass(this.anchor,"Anchor");}else{if(this.anchor!=t.node){this._removeItemClass(t.node,"Anchor");this._addItemClass(t.node,"Selected");}}this.selection[t.node.id]=1;}else{this._removeItemClass(t.node,"Selected");this._removeItemClass(t.node,"Anchor");}return t;};dojo.dnd.Selector.superclass.insertNodes.call(this,_c,_d,_e);this._normalizedCreator=_f;return this;},destroy:function(){dojo.dnd.Selector.superclass.destroy.call(this);this.selection=this.anchor=null;},markupFactory:function(_13,_14){_13._skipStartup=true;return new dojo.dnd.Selector(_14,_13);},onMouseDown:function(e){if(!this.current){return;}if(!this.singular&&!dojo.dnd.getCopyKeyState(e)&&!e.shiftKey&&(this.current.id in this.selection)){this.simpleSelection=true;dojo.stopEvent(e);return;}if(!this.singular&&e.shiftKey){if(!dojo.dnd.getCopyKeyState(e)){this._removeSelection();}var c=dojo.query("> .dojoDndItem",this.parent);if(c.length){if(!this.anchor){this.anchor=c[0];this._addItemClass(this.anchor,"Anchor");}this.selection[this.anchor.id]=1;if(this.anchor!=this.current){var i=0;for(;i= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo.dnd.Source"]){dojo._hasResource["dojo.dnd.Source"]=true;dojo.provide("dojo.dnd.Source");dojo.require("dojo.dnd.Selector");dojo.require("dojo.dnd.Manager");dojo.declare("dojo.dnd.Source",dojo.dnd.Selector,{isSource:true,horizontal:false,copyOnly:false,skipForm:false,withHandles:false,accept:["text"],constructor:function(_1,_2){if(!_2){_2={};}this.isSource=typeof _2.isSource=="undefined"?true:_2.isSource;var _3=_2.accept instanceof Array?_2.accept:["text"];this.accept=null;if(_3.length){this.accept={};for(var i=0;i<_3.length;++i){this.accept[_3[i]]=1;}}this.horizontal=_2.horizontal;this.copyOnly=_2.copyOnly;this.withHandles=_2.withHandles;this.isDragging=false;this.mouseDown=false;this.targetAnchor=null;this.targetBox=null;this.before=true;this.sourceState="";if(this.isSource){dojo.addClass(this.node,"dojoDndSource");}this.targetState="";if(this.accept){dojo.addClass(this.node,"dojoDndTarget");}if(this.horizontal){dojo.addClass(this.node,"dojoDndHorizontal");}this.topics=[dojo.subscribe("/dnd/source/over",this,"onDndSourceOver"),dojo.subscribe("/dnd/start",this,"onDndStart"),dojo.subscribe("/dnd/drop",this,"onDndDrop"),dojo.subscribe("/dnd/cancel",this,"onDndCancel")];},checkAcceptance:function(_5,_6){if(this==_5){return true;}for(var i=0;i<_6.length;++i){var _8=_5.getItem(_6[i].id).type;var _9=false;for(var j=0;j<_8.length;++j){if(_8[j] in this.accept){_9=true;break;}}if(!_9){return false;}}return true;},copyState:function(_b){return this.copyOnly||_b;},destroy:function(){dojo.dnd.Source.superclass.destroy.call(this);dojo.forEach(this.topics,dojo.unsubscribe);this.targetAnchor=null;},markupFactory:function(_c,_d){_c._skipStartup=true;return new dojo.dnd.Source(_d,_c);},onMouseMove:function(e){if(this.isDragging&&this.targetState=="Disabled"){return;}dojo.dnd.Source.superclass.onMouseMove.call(this,e);var m=dojo.dnd.manager();if(this.isDragging){var _10=false;if(this.current){if(!this.targetBox||this.targetAnchor!=this.current){this.targetBox={xy:dojo.coords(this.current,true),w:this.current.offsetWidth,h:this.current.offsetHeight};}if(this.horizontal){_10=(e.pageX-this.targetBox.xy.x)<(this.targetBox.w/2);}else{_10=(e.pageY-this.targetBox.xy.y)<(this.targetBox.h/2);}}if(this.current!=this.targetAnchor||_10!=this.before){this._markTargetAnchor(_10);m.canDrop(!this.current||m.source!=this||!(this.current.id in this.selection));}}else{if(this.mouseDown&&this.isSource){var _11=this.getSelectedNodes();if(_11.length){m.startDrag(this,_11,this.copyState(dojo.dnd.getCopyKeyState(e)));}}}},onMouseDown:function(e){if(this._legalMouseDown(e)&&(!this.skipForm||!dojo.dnd.isFormElement(e))){this.mouseDown=true;this.mouseButton=e.button;dojo.dnd.Source.superclass.onMouseDown.call(this,e);}},onMouseUp:function(e){if(this.mouseDown){this.mouseDown=false;dojo.dnd.Source.superclass.onMouseUp.call(this,e);}},onDndSourceOver:function(_14){if(this!=_14){this.mouseDown=false;if(this.targetAnchor){this._unmarkTargetAnchor();}}else{if(this.isDragging){var m=dojo.dnd.manager();m.canDrop(this.targetState!="Disabled"&&(!this.current||m.source!=this||!(this.current.id in this.selection)));}}},onDndStart:function(_16,_17,_18){if(this.isSource){this._changeState("Source",this==_16?(_18?"Copied":"Moved"):"");}var _19=this.accept&&this.checkAcceptance(_16,_17);this._changeState("Target",_19?"":"Disabled");if(_19&&this==_16){dojo.dnd.manager().overSource(this);}this.isDragging=true;},onDndDrop:function(_1a,_1b,_1c){do{if(this.containerState!="Over"){break;}var _1d=this._normalizedCreator;if(this!=_1a){if(this.creator){this._normalizedCreator=function(_1e,_1f){return _1d.call(this,_1a.getItem(_1e.id).data,_1f);};}else{if(_1c){this._normalizedCreator=function(_20,_21){var t=_1a.getItem(_20.id);var n=_20.cloneNode(true);n.id=dojo.dnd.getUniqueId();return {node:n,data:t.data,type:t.type};};}else{this._normalizedCreator=function(_24,_25){var t=_1a.getItem(_24.id);_1a.delItem(_24.id);return {node:_24,data:t.data,type:t.type};};}}}else{if(this.current&&this.current.id in this.selection){break;}if(this.creator){if(_1c){this._normalizedCreator=function(_27,_28){return _1d.call(this,_1a.getItem(_27.id).data,_28);};}else{if(!this.current){break;}this._normalizedCreator=function(_29,_2a){var t=_1a.getItem(_29.id);return {node:_29,data:t.data,type:t.type};};}}else{if(_1c){this._normalizedCreator=function(_2c,_2d){var t=_1a.getItem(_2c.id);var n=_2c.cloneNode(true);n.id=dojo.dnd.getUniqueId();return {node:n,data:t.data,type:t.type};};}else{if(!this.current){break;}this._normalizedCreator=function(_30,_31){var t=_1a.getItem(_30.id);return {node:_30,data:t.data,type:t.type};};}}}this._removeSelection();if(this!=_1a){this._removeAnchor();}if(this!=_1a&&!_1c&&!this.creator){_1a.selectNone();}this.insertNodes(true,_1b,this.before,this.current);if(this!=_1a&&!_1c&&this.creator){_1a.deleteSelectedNodes();}this._normalizedCreator=_1d;}while(false);this.onDndCancel();},onDndCancel:function(){if(this.targetAnchor){this._unmarkTargetAnchor();this.targetAnchor=null;}this.before=true;this.isDragging=false;this.mouseDown=false;delete this.mouseButton;this._changeState("Source","");this._changeState("Target","");},onOverEvent:function(){dojo.dnd.Source.superclass.onOverEvent.call(this);dojo.dnd.manager().overSource(this);},onOutEvent:function(){dojo.dnd.Source.superclass.onOutEvent.call(this);dojo.dnd.manager().outSource(this);},_markTargetAnchor:function(_33){if(this.current==this.targetAnchor&&this.before==_33){return;}if(this.targetAnchor){this._removeItemClass(this.targetAnchor,this.before?"Before":"After");}this.targetAnchor=this.current;this.targetBox=null;this.before=_33;if(this.targetAnchor){this._addItemClass(this.targetAnchor,this.before?"Before":"After");}},_unmarkTargetAnchor:function(){if(!this.targetAnchor){return;}this._removeItemClass(this.targetAnchor,this.before?"Before":"After");this.targetAnchor=null;this.targetBox=null;this.before=true;},_markDndStatus:function(_34){this._changeState("Source",_34?"Copied":"Moved");},_legalMouseDown:function(e){if(!this.withHandles){return true;}for(var _36=e.target;_36&&!dojo.hasClass(_36,"dojoDndItem");_36=_36.parentNode){if(dojo.hasClass(_36,"dojoDndHandle")){return true;}}return false;}});dojo.declare("dojo.dnd.Target",dojo.dnd.Source,{constructor:function(_37,_38){this.isSource=false;dojo.removeClass(this.node,"dojoDndSource");},markupFactory:function(_39,_3a){_39._skipStartup=true;return new dojo.dnd.Target(_3a,_39);}});} \ No newline at end of file +if(!dojo._hasResource["dojo.dnd.Source"]){dojo._hasResource["dojo.dnd.Source"]=true;dojo.provide("dojo.dnd.Source");dojo.require("dojo.dnd.Selector");dojo.require("dojo.dnd.Manager");dojo.declare("dojo.dnd.Source",dojo.dnd.Selector,{isSource:true,horizontal:false,copyOnly:false,selfCopy:false,selfAccept:true,skipForm:false,withHandles:false,autoSync:false,delay:0,accept:["text"],constructor:function(_1,_2){dojo.mixin(this,dojo.mixin({},_2));var _3=this.accept;if(_3.length){this.accept={};for(var i=0;i<_3.length;++i){this.accept[_3[i]]=1;}}this.isDragging=false;this.mouseDown=false;this.targetAnchor=null;this.targetBox=null;this.before=true;this._lastX=0;this._lastY=0;this.sourceState="";if(this.isSource){dojo.addClass(this.node,"dojoDndSource");}this.targetState="";if(this.accept){dojo.addClass(this.node,"dojoDndTarget");}if(this.horizontal){dojo.addClass(this.node,"dojoDndHorizontal");}this.topics=[dojo.subscribe("/dnd/source/over",this,"onDndSourceOver"),dojo.subscribe("/dnd/start",this,"onDndStart"),dojo.subscribe("/dnd/drop",this,"onDndDrop"),dojo.subscribe("/dnd/cancel",this,"onDndCancel")];},checkAcceptance:function(_5,_6){if(this==_5){return !this.copyOnly||this.selfAccept;}for(var i=0;i<_6.length;++i){var _8=_5.getItem(_6[i].id).type;var _9=false;for(var j=0;j<_8.length;++j){if(_8[j] in this.accept){_9=true;break;}}if(!_9){return false;}}return true;},copyState:function(_b,_c){if(_b){return true;}if(arguments.length<2){_c=this==dojo.dnd.manager().target;}if(_c){if(this.copyOnly){return this.selfCopy;}}else{return this.copyOnly;}return false;},destroy:function(){dojo.dnd.Source.superclass.destroy.call(this);dojo.forEach(this.topics,dojo.unsubscribe);this.targetAnchor=null;},markupFactory:function(_d,_e){_d._skipStartup=true;return new dojo.dnd.Source(_e,_d);},onMouseMove:function(e){if(this.isDragging&&this.targetState=="Disabled"){return;}dojo.dnd.Source.superclass.onMouseMove.call(this,e);var m=dojo.dnd.manager();if(this.isDragging){var _11=false;if(this.current){if(!this.targetBox||this.targetAnchor!=this.current){this.targetBox={xy:dojo.coords(this.current,true),w:this.current.offsetWidth,h:this.current.offsetHeight};}if(this.horizontal){_11=(e.pageX-this.targetBox.xy.x)<(this.targetBox.w/2);}else{_11=(e.pageY-this.targetBox.xy.y)<(this.targetBox.h/2);}}if(this.current!=this.targetAnchor||_11!=this.before){this._markTargetAnchor(_11);m.canDrop(!this.current||m.source!=this||!(this.current.id in this.selection));}}else{if(this.mouseDown&&this.isSource&&(Math.abs(e.pageX-this._lastX)>this.delay||Math.abs(e.pageY-this._lastY)>this.delay)){var _12=this.getSelectedNodes();if(_12.length){m.startDrag(this,_12,this.copyState(dojo.dnd.getCopyKeyState(e),true));}}}},onMouseDown:function(e){if(this._legalMouseDown(e)&&(!this.skipForm||!dojo.dnd.isFormElement(e))){this.mouseDown=true;this.mouseButton=e.button;this._lastX=e.pageX;this._lastY=e.pageY;dojo.dnd.Source.superclass.onMouseDown.call(this,e);}},onMouseUp:function(e){if(this.mouseDown){this.mouseDown=false;dojo.dnd.Source.superclass.onMouseUp.call(this,e);}},onDndSourceOver:function(_15){if(this!=_15){this.mouseDown=false;if(this.targetAnchor){this._unmarkTargetAnchor();}}else{if(this.isDragging){var m=dojo.dnd.manager();m.canDrop(this.targetState!="Disabled"&&(!this.current||m.source!=this||!(this.current.id in this.selection)));}}},onDndStart:function(_17,_18,_19){if(this.autoSync){this.sync();}if(this.isSource){this._changeState("Source",this==_17?(_19?"Copied":"Moved"):"");}var _1a=this.accept&&this.checkAcceptance(_17,_18);this._changeState("Target",_1a?"":"Disabled");if(this==_17){dojo.dnd.manager().overSource(this);}this.isDragging=true;},onDndDrop:function(_1b,_1c,_1d,_1e){if(this==_1e){this.onDrop(_1b,_1c,_1d);}this.onDndCancel();},onDndCancel:function(){if(this.targetAnchor){this._unmarkTargetAnchor();this.targetAnchor=null;}this.before=true;this.isDragging=false;this.mouseDown=false;delete this.mouseButton;this._changeState("Source","");this._changeState("Target","");},onDrop:function(_1f,_20,_21){if(this!=_1f){this.onDropExternal(_1f,_20,_21);}else{this.onDropInternal(_20,_21);}},onDropExternal:function(_22,_23,_24){var _25=this._normalizedCreator;if(this.creator){this._normalizedCreator=function(_26,_27){return _25.call(this,_22.getItem(_26.id).data,_27);};}else{if(_24){this._normalizedCreator=function(_28,_29){var t=_22.getItem(_28.id);var n=_28.cloneNode(true);n.id=dojo.dnd.getUniqueId();return {node:n,data:t.data,type:t.type};};}else{this._normalizedCreator=function(_2c,_2d){var t=_22.getItem(_2c.id);_22.delItem(_2c.id);return {node:_2c,data:t.data,type:t.type};};}}this.selectNone();if(!_24&&!this.creator){_22.selectNone();}this.insertNodes(true,_23,this.before,this.current);if(!_24&&this.creator){_22.deleteSelectedNodes();}this._normalizedCreator=_25;},onDropInternal:function(_2f,_30){var _31=this._normalizedCreator;if(this.current&&this.current.id in this.selection){return;}if(_30){if(this.creator){this._normalizedCreator=function(_32,_33){return _31.call(this,this.getItem(_32.id).data,_33);};}else{this._normalizedCreator=function(_34,_35){var t=this.getItem(_34.id);var n=_34.cloneNode(true);n.id=dojo.dnd.getUniqueId();return {node:n,data:t.data,type:t.type};};}}else{if(!this.current){return;}this._normalizedCreator=function(_38,_39){var t=this.getItem(_38.id);return {node:_38,data:t.data,type:t.type};};}this._removeSelection();this.insertNodes(true,_2f,this.before,this.current);this._normalizedCreator=_31;},onDraggingOver:function(){},onDraggingOut:function(){},onOverEvent:function(){dojo.dnd.Source.superclass.onOverEvent.call(this);dojo.dnd.manager().overSource(this);if(this.isDragging&&this.targetState!="Disabled"){this.onDraggingOver();}},onOutEvent:function(){dojo.dnd.Source.superclass.onOutEvent.call(this);dojo.dnd.manager().outSource(this);if(this.isDragging&&this.targetState!="Disabled"){this.onDraggingOut();}},_markTargetAnchor:function(_3b){if(this.current==this.targetAnchor&&this.before==_3b){return;}if(this.targetAnchor){this._removeItemClass(this.targetAnchor,this.before?"Before":"After");}this.targetAnchor=this.current;this.targetBox=null;this.before=_3b;if(this.targetAnchor){this._addItemClass(this.targetAnchor,this.before?"Before":"After");}},_unmarkTargetAnchor:function(){if(!this.targetAnchor){return;}this._removeItemClass(this.targetAnchor,this.before?"Before":"After");this.targetAnchor=null;this.targetBox=null;this.before=true;},_markDndStatus:function(_3c){this._changeState("Source",_3c?"Copied":"Moved");},_legalMouseDown:function(e){if(!this.withHandles){return true;}for(var _3e=e.target;_3e&&!dojo.hasClass(_3e,"dojoDndItem");_3e=_3e.parentNode){if(dojo.hasClass(_3e,"dojoDndHandle")){return true;}}return false;}});dojo.declare("dojo.dnd.Target",dojo.dnd.Source,{constructor:function(_3f,_40){this.isSource=false;dojo.removeClass(this.node,"dojoDndSource");},markupFactory:function(_41,_42){_41._skipStartup=true;return new dojo.dnd.Target(_42,_41);}});dojo.declare("dojo.dnd.AutoSource",dojo.dnd.Source,{constructor:function(_43,_44){this.autoSync=true;},markupFactory:function(_45,_46){_45._skipStartup=true;return new dojo.dnd.AutoSource(_46,_45);}});} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/dnd/TimedMoveable.js b/spring-js/src/main/resources/META-INF/dojo/dnd/TimedMoveable.js index 571f5bb0..0dc751a4 100644 --- a/spring-js/src/main/resources/META-INF/dojo/dnd/TimedMoveable.js +++ b/spring-js/src/main/resources/META-INF/dojo/dnd/TimedMoveable.js @@ -1,11 +1,7 @@ /* - Copyright (c) 2004-2008, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ diff --git a/spring-js/src/main/resources/META-INF/dojo/dnd/autoscroll.js b/spring-js/src/main/resources/META-INF/dojo/dnd/autoscroll.js index 6310b91a..f537ecb4 100644 --- a/spring-js/src/main/resources/META-INF/dojo/dnd/autoscroll.js +++ b/spring-js/src/main/resources/META-INF/dojo/dnd/autoscroll.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo.dnd.autoscroll"]){dojo._hasResource["dojo.dnd.autoscroll"]=true;dojo.provide("dojo.dnd.autoscroll");dojo.dnd.getViewport=function(){var d=dojo.doc,dd=d.documentElement,w=window,b=dojo.body();if(dojo.isMozilla){return {w:dd.clientWidth,h:w.innerHeight};}else{if(!dojo.isOpera&&w.innerWidth){return {w:w.innerWidth,h:w.innerHeight};}else{if(!dojo.isOpera&&dd&&dd.clientWidth){return {w:dd.clientWidth,h:dd.clientHeight};}else{if(b.clientWidth){return {w:b.clientWidth,h:b.clientHeight};}}}}return null;};dojo.dnd.V_TRIGGER_AUTOSCROLL=32;dojo.dnd.H_TRIGGER_AUTOSCROLL=32;dojo.dnd.V_AUTOSCROLL_VALUE=16;dojo.dnd.H_AUTOSCROLL_VALUE=16;dojo.dnd.autoScroll=function(e){var v=dojo.dnd.getViewport(),dx=0,dy=0;if(e.clientXv.w-dojo.dnd.H_TRIGGER_AUTOSCROLL){dx=dojo.dnd.H_AUTOSCROLL_VALUE;}}if(e.clientYv.h-dojo.dnd.V_TRIGGER_AUTOSCROLL){dy=dojo.dnd.V_AUTOSCROLL_VALUE;}}window.scrollBy(dx,dy);};dojo.dnd._validNodes={"div":1,"p":1,"td":1};dojo.dnd._validOverflow={"auto":1,"scroll":1};dojo.dnd.autoScrollNodes=function(e){for(var n=e.target;n;){if(n.nodeType==1&&(n.tagName.toLowerCase() in dojo.dnd._validNodes)){var s=dojo.getComputedStyle(n);if(s.overflow.toLowerCase() in dojo.dnd._validOverflow){var b=dojo._getContentBox(n,s),t=dojo._abs(n,true);b.l+=t.x+n.scrollLeft;b.t+=t.y+n.scrollTop;var w=Math.min(dojo.dnd.H_TRIGGER_AUTOSCROLL,b.w/2),h=Math.min(dojo.dnd.V_TRIGGER_AUTOSCROLL,b.h/2),rx=e.pageX-b.l,ry=e.pageY-b.t,dx=0,dy=0;if(rx>0&&rxb.w-w){dx=dojo.dnd.H_AUTOSCROLL_VALUE;}}}if(ry>0&&ryb.h-h){dy=dojo.dnd.V_AUTOSCROLL_VALUE;}}}var _14=n.scrollLeft,_15=n.scrollTop;n.scrollLeft=n.scrollLeft+dx;n.scrollTop=n.scrollTop+dy;if(_14!=n.scrollLeft||_15!=n.scrollTop){return;}}}try{n=n.parentNode;}catch(x){n=null;}}dojo.dnd.autoScroll(e);};} \ No newline at end of file +if(!dojo._hasResource["dojo.dnd.autoscroll"]){dojo._hasResource["dojo.dnd.autoscroll"]=true;dojo.provide("dojo.dnd.autoscroll");dojo.dnd.getViewport=function(){var d=dojo.doc,dd=d.documentElement,w=window,b=dojo.body();if(dojo.isMozilla){return {w:dd.clientWidth,h:w.innerHeight};}else{if(!dojo.isOpera&&w.innerWidth){return {w:w.innerWidth,h:w.innerHeight};}else{if(!dojo.isOpera&&dd&&dd.clientWidth){return {w:dd.clientWidth,h:dd.clientHeight};}else{if(b.clientWidth){return {w:b.clientWidth,h:b.clientHeight};}}}}return null;};dojo.dnd.V_TRIGGER_AUTOSCROLL=32;dojo.dnd.H_TRIGGER_AUTOSCROLL=32;dojo.dnd.V_AUTOSCROLL_VALUE=16;dojo.dnd.H_AUTOSCROLL_VALUE=16;dojo.dnd.autoScroll=function(e){var v=dojo.dnd.getViewport(),dx=0,dy=0;if(e.clientXv.w-dojo.dnd.H_TRIGGER_AUTOSCROLL){dx=dojo.dnd.H_AUTOSCROLL_VALUE;}}if(e.clientYv.h-dojo.dnd.V_TRIGGER_AUTOSCROLL){dy=dojo.dnd.V_AUTOSCROLL_VALUE;}}window.scrollBy(dx,dy);};dojo.dnd._validNodes={"div":1,"p":1,"td":1};dojo.dnd._validOverflow={"auto":1,"scroll":1};dojo.dnd.autoScrollNodes=function(e){for(var n=e.target;n;){if(n.nodeType==1&&(n.tagName.toLowerCase() in dojo.dnd._validNodes)){var s=dojo.getComputedStyle(n);if(s.overflow.toLowerCase() in dojo.dnd._validOverflow){var b=dojo._getContentBox(n,s),t=dojo._abs(n,true);var w=Math.min(dojo.dnd.H_TRIGGER_AUTOSCROLL,b.w/2),h=Math.min(dojo.dnd.V_TRIGGER_AUTOSCROLL,b.h/2),rx=e.pageX-t.x,ry=e.pageY-t.y,dx=0,dy=0;if(dojo.isSafari||dojo.isOpera){rx+=dojo.body().scrollLeft,ry+=dojo.body().scrollTop;}if(rx>0&&rxb.w-w){dx=w;}}}if(ry>0&&ryb.h-h){dy=h;}}}var _14=n.scrollLeft,_15=n.scrollTop;n.scrollLeft=n.scrollLeft+dx;n.scrollTop=n.scrollTop+dy;if(_14!=n.scrollLeft||_15!=n.scrollTop){return;}}}try{n=n.parentNode;}catch(x){n=null;}}dojo.dnd.autoScroll(e);};} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/dnd/common.js b/spring-js/src/main/resources/META-INF/dojo/dnd/common.js index 6bd1927e..d8d7a224 100644 --- a/spring-js/src/main/resources/META-INF/dojo/dnd/common.js +++ b/spring-js/src/main/resources/META-INF/dojo/dnd/common.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo.dnd.common"]){dojo._hasResource["dojo.dnd.common"]=true;dojo.provide("dojo.dnd.common");dojo.dnd._copyKey=navigator.appVersion.indexOf("Macintosh")<0?"ctrlKey":"metaKey";dojo.dnd.getCopyKeyState=function(e){return e[dojo.dnd._copyKey];};dojo.dnd._uniqueId=0;dojo.dnd.getUniqueId=function(){var id;do{id="dojoUnique"+(++dojo.dnd._uniqueId);}while(dojo.byId(id));return id;};dojo.dnd._empty={};dojo.dnd.isFormElement=function(e){var t=e.target;if(t.nodeType==3){t=t.parentNode;}return " button textarea input select option ".indexOf(" "+t.tagName.toLowerCase()+" ")>=0;};} \ No newline at end of file +if(!dojo._hasResource["dojo.dnd.common"]){dojo._hasResource["dojo.dnd.common"]=true;dojo.provide("dojo.dnd.common");dojo.dnd._isMac=navigator.appVersion.indexOf("Macintosh")>=0;dojo.dnd._copyKey=dojo.dnd._isMac?"metaKey":"ctrlKey";dojo.dnd.getCopyKeyState=function(e){return e[dojo.dnd._copyKey];};dojo.dnd._uniqueId=0;dojo.dnd.getUniqueId=function(){var id;do{id=dojo._scopeName+"Unique"+(++dojo.dnd._uniqueId);}while(dojo.byId(id));return id;};dojo.dnd._empty={};dojo.dnd.isFormElement=function(e){var t=e.target;if(t.nodeType==3){t=t.parentNode;}return " button textarea input select option ".indexOf(" "+t.tagName.toLowerCase()+" ")>=0;};} \ No newline at end of file diff --git a/spring-js/src/main/resources/META-INF/dojo/dnd/move.js b/spring-js/src/main/resources/META-INF/dojo/dnd/move.js index 0a7973af..ca37c1fa 100644 --- a/spring-js/src/main/resources/META-INF/dojo/dnd/move.js +++ b/spring-js/src/main/resources/META-INF/dojo/dnd/move.js @@ -1,12 +1,8 @@ /* - Copyright (c) 2004-2007, The Dojo Foundation - All Rights Reserved. - - Licensed under the Academic Free License version 2.1 or above OR the - modified BSD license. For more information on Dojo licensing, see: - - http://dojotoolkit.org/book/dojo-book-0-9/introduction/licensing + Copyright (c) 2004-2008, The Dojo Foundation All Rights Reserved. + Available via Academic Free License >= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ -if(!dojo._hasResource["dojo.dnd.move"]){dojo._hasResource["dojo.dnd.move"]=true;dojo.provide("dojo.dnd.move");dojo.require("dojo.dnd.Mover");dojo.require("dojo.dnd.Moveable");dojo.declare("dojo.dnd.move.constrainedMoveable",dojo.dnd.Moveable,{constraints:function(){},within:false,markupFactory:function(_1,_2){return new dojo.dnd.move.constrainedMoveable(_2,_1);},constructor:function(_3,_4){if(!_4){_4={};}this.constraints=_4.constraints;this.within=_4.within;},onFirstMove:function(_5){var c=this.constraintBox=this.constraints.call(this,_5),m=_5.marginBox;c.r=c.l+c.w-(this.within?m.w:0);c.b=c.t+c.h-(this.within?m.h:0);},onMove:function(_8,_9){var c=this.constraintBox;_9.l=_9.l= 2.1 OR the modified BSD license. + see: http://dojotoolkit.org/license for details */ /* @@ -17,4 +13,4 @@ for documentation and information on getting the source. */ -if(typeof dojo=="undefined"){(function(){if(typeof this["djConfig"]=="undefined"){this.djConfig={};}if((!this["console"])||(!console["firebug"])){this.console={};}var cn=["assert","count","debug","dir","dirxml","error","group","groupEnd","info","log","profile","profileEnd","time","timeEnd","trace","warn"];var i=0,tn;while((tn=cn[i++])){if(!console[tn]){console[tn]=function(){};}}if(typeof this["dojo"]=="undefined"){this.dojo={};}var d=dojo;dojo.global=this;var _5={isDebug:false,libraryScriptUri:"",preventBackButtonFix:true,delayMozLoadingFix:false};for(var _6 in _5){if(typeof djConfig[_6]=="undefined"){djConfig[_6]=_5[_6];}}var _7=["Browser","Rhino","Spidermonkey","Mobile"];var t;while(t=_7.shift()){d["is"+t]=false;}dojo.locale=djConfig.locale;dojo.version={major:0,minor:0,patch:0,flag:"dev",revision:Number("$Rev: 11832 $".match(/[0-9]+/)[0]),toString:function(){with(d.version){return major+"."+minor+"."+patch+flag+" ("+revision+")";}}};if(typeof OpenAjax!="undefined"){OpenAjax.hub.registerLibrary("dojo","http://dojotoolkit.org",d.version.toString());}dojo._mixin=function(_9,_a){var _b={};for(var x in _a){if(_b[x]===undefined||_b[x]!=_a[x]){_9[x]=_a[x];}}if(d["isIE"]&&_a){var p=_a.toString;if(typeof p=="function"&&p!=_9.toString&&p!=_b.toString&&p!="\nfunction toString() {\n [native code]\n}\n"){_9.toString=_a.toString;}}return _9;};dojo.mixin=function(_e,_f){for(var i=1,l=arguments.length;i0){d._callLoaded();}};dojo.unloaded=function(){var mll=this._unloaders;while(mll.length){(mll.pop())();}};dojo.addOnLoad=function(obj,_39){if(arguments.length==1){d._loaders.push(obj);}else{if(arguments.length>1){d._loaders.push(function(){obj[_39]();});}}if(d._postLoad&&d._inFlightCount==0&&!d._loadNotifying){d._callLoaded();}};dojo.addOnUnload=function(obj,_3b){if(arguments.length==1){d._unloaders.push(obj);}else{if(arguments.length>1){d._unloaders.push(function(){obj[_3b]();});}}};dojo._modulesLoaded=function(){if(d._postLoad){return;}if(d._inFlightCount>0){console.debug("files still in flight!");return;}d._callLoaded();};dojo._callLoaded=function(){if(typeof setTimeout=="object"||(djConfig["useXDomain"]&&d.isOpera)){setTimeout("dojo.loaded();",0);}else{d.loaded();}};dojo._getModuleSymbols=function(_3c){var _3d=_3c.split(".");for(var i=_3d.length;i>0;i--){var _3f=_3d.slice(0,i).join(".");if((i==1)&&!this._moduleHasPrefix(_3f)){_3d[0]="../"+_3d[0];}else{var _40=this._getModulePrefix(_3f);if(_40!=_3f){_3d.splice(0,i,_40);break;}}}return _3d;};dojo._global_omit_module_check=false;dojo._loadModule=dojo.require=function(_41,_42){_42=this._global_omit_module_check||_42;var _43=this._loadedModules[_41];if(_43){return _43;}var _44=this._getModuleSymbols(_41).join("/")+".js";var _45=(!_42)?_41:null;var ok=this._loadPath(_44,_45);if((!ok)&&(!_42)){throw new Error("Could not load '"+_41+"'; last tried '"+_44+"'");}if((!_42)&&(!this["_isXDomain"])){_43=this._loadedModules[_41];if(!_43){throw new Error("symbol '"+_41+"' is not defined after loading '"+_44+"'");}}return _43;};dojo.provide=function(_47){_47=_47+"";return (d._loadedModules[_47]=d.getObject(_47,true));};dojo.platformRequire=function(_48){var _49=_48["common"]||[];var _4a=_49.concat(_48[d._name]||_48["default"]||[]);for(var x=0;x<_4a.length;x++){var _4c=_4a[x];if(_4c.constructor==Array){d._loadModule.apply(d,_4c);}else{d._loadModule(_4c);}}};dojo.requireIf=function(_4d,_4e){if(_4d===true){var _4f=[];for(var i=1;i0&&!(j==1&&_60[0]=="")&&_60[j]==".."&&_60[j-1]!=".."){if(j==(_60.length-1)){_60.splice(j,1);_60[j-1]="";}else{_60.splice(j-1,2);j-=2;}}}}_5d.path=_60.join("/");}}}}uri="";if(_5d.scheme){uri+=_5d.scheme+":";}if(_5d.authority){uri+="//"+_5d.authority;}uri+=_5d.path;if(_5d.query){uri+="?"+_5d.query;}if(_5d.fragment){uri+="#"+_5d.fragment;}}this.uri=uri.toString();var r=this.uri.match(ore);this.scheme=r[2]||(r[1]?"":n);this.authority=r[4]||(r[3]?"":n);this.path=r[5];this.query=r[7]||(r[6]?"":n);this.fragment=r[9]||(r[8]?"":n);if(this.authority!=n){r=this.authority.match(ire);this.user=r[3]||n;this.password=r[4]||n;this.host=r[5];this.port=r[7]||n;}};dojo._Url.prototype.toString=function(){return this.uri;};dojo.moduleUrl=function(_63,url){var loc=dojo._getModuleSymbols(_63).join("/");if(!loc){return null;}if(loc.lastIndexOf("/")!=loc.length-1){loc+="/";}var _66=loc.indexOf(":");if(loc.charAt(0)!="/"&&(_66==-1||_66>loc.indexOf("/"))){loc=d.baseUrl+loc;}return new d._Url(loc,url);};})();if(typeof window!="undefined"){dojo.isBrowser=true;dojo._name="browser";(function(){var d=dojo;if(document&&document.getElementsByTagName){var _68=document.getElementsByTagName("script");var _69=/dojo(\.xd)?\.js([\?\.]|$)/i;for(var i=0;i<_68.length;i++){var src=_68[i].getAttribute("src");if(!src){continue;}var m=src.match(_69);if(m){if(!djConfig["baseUrl"]){djConfig["baseUrl"]=src.substring(0,m.index);}var cfg=_68[i].getAttribute("djConfig");if(cfg){var _6e=eval("({ "+cfg+" })");for(var x in _6e){djConfig[x]=_6e[x];}}break;}}}d.baseUrl=djConfig["baseUrl"];var n=navigator;var dua=n.userAgent;var dav=n.appVersion;var tv=parseFloat(dav);d.isOpera=(dua.indexOf("Opera")>=0)?tv:0;d.isKhtml=(dav.indexOf("Konqueror")>=0)||(dav.indexOf("Safari")>=0)?tv:0;if(dav.indexOf("Safari")>=0){d.isSafari=parseFloat(dav.split("Version/")[1])||2;}var _74=dua.indexOf("Gecko");d.isMozilla=d.isMoz=((_74>=0)&&(!d.isKhtml))?tv:0;d.isFF=0;d.isIE=0;try{if(d.isMoz){d.isFF=parseFloat(dua.split("Firefox/")[1].split(" ")[0]);}if((document.all)&&(!d.isOpera)){d.isIE=parseFloat(dav.split("MSIE ")[1].split(";")[0]);}}catch(e){}if(dojo.isIE&&(window.location.protocol==="file:")){djConfig.ieForceActiveXXhr=true;}var cm=document["compatMode"];d.isQuirks=(cm=="BackCompat")||(cm=="QuirksMode")||(d.isIE<6);d.locale=djConfig.locale||(d.isIE?n.userLanguage:n.language).toLowerCase();d._println=console.debug;d._XMLHTTP_PROGIDS=["Msxml2.XMLHTTP","Microsoft.XMLHTTP","Msxml2.XMLHTTP.4.0"];d._xhrObj=function(){var _76=null;var _77=null;if(!dojo.isIE||!djConfig.ieForceActiveXXhr){try{_76=new XMLHttpRequest();}catch(e){}}if(!_76){for(var i=0;i<3;++i){var _79=dojo._XMLHTTP_PROGIDS[i];try{_76=new ActiveXObject(_79);}catch(e){_77=e;}if(_76){dojo._XMLHTTP_PROGIDS=[_79];break;}}}if(!_76){throw new Error("XMLHTTP not available: "+_77);}return _76;};d._isDocumentOk=function(_7a){var _7b=_7a.status||0;return ((_7b>=200)&&(_7b<300))||(_7b==304)||(_7b==1223)||(!_7b&&(location.protocol=="file:"||location.protocol=="chrome:"));};var _7c=window.location+"";var _7d=document.getElementsByTagName("base");var _7e=(_7d&&_7d.length>0);d._getText=function(uri,_80){var _81=this._xhrObj();if(!_7e&&dojo._Url){uri=(new dojo._Url(_7c,uri)).toString();}_81.open("GET",uri,false);try{_81.send(null);if(!d._isDocumentOk(_81)){var err=Error("Unable to load "+uri+" status:"+_81.status);err.status=_81.status;err.responseText=_81.responseText;throw err;}}catch(e){if(_80){return null;}throw e;}return _81.responseText;};})();dojo._initFired=false;dojo._loadInit=function(e){dojo._initFired=true;var _84=(e&&e.type)?e.type.toLowerCase():"load";if(arguments.callee.initialized||(_84!="domcontentloaded"&&_84!="load")){return;}arguments.callee.initialized=true;if(typeof dojo["_khtmlTimer"]!="undefined"){clearInterval(dojo._khtmlTimer);delete dojo._khtmlTimer;}if(dojo._inFlightCount==0){dojo._modulesLoaded();}};if(document.addEventListener){if(dojo.isOpera||(dojo.isMoz&&(djConfig["enableMozDomContentLoaded"]===true))){document.addEventListener("DOMContentLoaded",dojo._loadInit,null);}window.addEventListener("load",dojo._loadInit,null);}if(/(WebKit|khtml)/i.test(navigator.userAgent)){dojo._khtmlTimer=setInterval(function(){if(/loaded|complete/.test(document.readyState)){dojo._loadInit();}},10);}(function(){var _w=window;var _86=function(_87,fp){var _89=_w[_87]||function(){};_w[_87]=function(){fp.apply(_w,arguments);_89.apply(_w,arguments);};};if(dojo.isIE){document.write(""+"");var _8a=true;_86("onbeforeunload",function(){_w.setTimeout(function(){_8a=false;},0);});_86("onunload",function(){if(_8a){dojo.unloaded();}});try{document.namespaces.add("v","urn:schemas-microsoft-com:vml");document.createStyleSheet().addRule("v\\:*","behavior:url(#default#VML)");}catch(e){}}else{_86("onbeforeunload",function(){dojo.unloaded();});}})();}if(djConfig.isDebug){dojo.require("dojo._firebug.firebug");}if(djConfig.debugAtAllCosts){djConfig.useXDomain=true;dojo.require("dojo._base._loader.loader_xd");dojo.require("dojo._base._loader.loader_debug");}}if(!dojo._hasResource["dojo._base.lang"]){dojo._hasResource["dojo._base.lang"]=true;dojo.provide("dojo._base.lang");dojo.isString=function(it){return typeof it=="string"||it instanceof String;};dojo.isArray=function(it){return it&&it instanceof Array||typeof it=="array";};dojo.isFunction=(function(){var _8d=function(it){return typeof it=="function"||it instanceof Function;};return dojo.isSafari?function(it){if(typeof it=="function"&&it=="[object NodeList]"){return false;}return _8d(it);}:_8d;})();dojo.isObject=function(it){return it!==undefined&&(it===null||typeof it=="object"||dojo.isArray(it)||dojo.isFunction(it));};dojo.isArrayLike=function(it){var d=dojo;return it&&it!==undefined&&!d.isString(it)&&!d.isFunction(it)&&!(it.tagName&&it.tagName.toLowerCase()=="form")&&(d.isArray(it)||isFinite(it.length));};dojo.isAlien=function(it){return it&&!dojo.isFunction(it)&&/\{\s*\[native code\]\s*\}/.test(String(it));};dojo.extend=function(_94,_95){for(var i=1,l=arguments.length;i2){return dojo._hitchArgs.apply(dojo,arguments);}if(!_9f){_9f=_9e;_9e=null;}if(dojo.isString(_9f)){_9e=_9e||dojo.global;if(!_9e[_9f]){throw (["dojo.hitch: scope[\"",_9f,"\"] is null (scope=\"",_9e,"\")"].join(""));}return function(){return _9e[_9f].apply(_9e,arguments||[]);};}return !_9e?_9f:function(){return _9f.apply(_9e,arguments||[]);};};dojo.delegate=dojo._delegate=function(obj,_a1){function TMP(){};TMP.prototype=obj;var tmp=new TMP();if(_a1){dojo.mixin(tmp,_a1);}return tmp;};dojo.partial=function(_a3){var arr=[null];return dojo.hitch.apply(dojo,arr.concat(dojo._toArray(arguments)));};dojo._toArray=function(obj,_a6,_a7){var arr=_a7||[];for(var x=_a6||0;x3)){dojo.deprecated("dojo.declare: for class '"+_ae+"' pass initializer function as 'constructor' property instead of as a separate argument.","","1.0");var c=_b0;_b0=arguments[3]||{};_b0.constructor=c;}var dd=arguments.callee,_b3=null;if(dojo.isArray(_af)){_b3=_af;_af=_b3.shift();}if(_b3){for(var i=0,m;i<_b3.length;i++){m=_b3[i];if(!m){throw ("Mixin #"+i+" to declaration of "+_ae+" is null. It's likely a required module is not loaded.");}_af=dd._delegate(_af,m);}}var _b6=(_b0||0).constructor,_b7=dd._delegate(_af),fn;for(var i in _b0){if(dojo.isFunction(fn=_b0[i])&&(!0[i])){fn.nom=i;}}dojo.extend(_b7,{declaredClass:_ae,_constructor:_b6,preamble:null},_b0||0);_b7.prototype.constructor=_b7;return dojo.setObject(_ae,_b7);};dojo.mixin(dojo.declare,{_delegate:function(_b9,_ba){var bp=(_b9||0).prototype,mp=(_ba||0).prototype;var _bd=dojo.declare._makeCtor();dojo.mixin(_bd,{superclass:bp,mixin:mp,extend:dojo.declare._extend});if(_b9){_bd.prototype=dojo._delegate(bp);}dojo.extend(_bd,dojo.declare._core,mp||0,{_constructor:null,preamble:null});_bd.prototype.constructor=_bd;_bd.prototype.declaredClass=(bp||0).declaredClass+"_"+(mp||0).declaredClass;return _bd;},_extend:function(_be){for(var i in _be){if(dojo.isFunction(fn=_be[i])&&(!0[i])){fn.nom=i;}}dojo.extend(this,_be);},_makeCtor:function(){return function(){this._construct(arguments);};},_core:{_construct:function(_c0){var c=_c0.callee,s=c.superclass,ct=s&&s.constructor,m=c.mixin,mct=m&&m.constructor,a=_c0,ii,fn;if(a[0]){if((fn=a[0]["preamble"])){a=fn.apply(this,a)||a;}}if(fn=c.prototype.preamble){a=fn.apply(this,a)||a;}if(ct&&ct.apply){ct.apply(this,a);}if(mct&&mct.apply){mct.apply(this,a);}if(ii=c.prototype._constructor){ii.apply(this,_c0);}if(this.constructor.prototype==c.prototype&&(ct=this.postscript)){ct.apply(this,_c0);}},_findMixin:function(_c9){var c=this.constructor,p,m;while(c){p=c.superclass;m=c.mixin;if(m==_c9||(m instanceof _c9.constructor)){return p;}if(m&&(m=m._findMixin(_c9))){return m;}c=p&&p.constructor;}},_findMethod:function(_cd,_ce,_cf,has){var p=_cf,c,m,f;do{c=p.constructor;m=c.mixin;if(m&&(m=this._findMethod(_cd,_ce,m,has))){return m;}if((f=p[_cd])&&(has==(f==_ce))){return p;}p=c.superclass;}while(p);return !has&&(p=this._findMixin(_cf))&&this._findMethod(_cd,_ce,p,has);},inherited:function(_d5,_d6,_d7){var a=arguments;if(!dojo.isString(a[0])){_d7=_d6;_d6=_d5;_d5=_d6.callee.nom;}var c=_d6.callee,p=this.constructor.prototype,a=_d7||_d6,fn,mp;if(this[_d5]!=c||p[_d5]==c){mp=this._findMethod(_d5,c,p,true);if(!mp){throw (this.declaredClass+": name argument (\""+_d5+"\") to inherited must match callee (declare.js)");}p=this._findMethod(_d5,c,mp,false);}fn=p&&p[_d5];if(!fn){console.debug(mp.declaredClass+": no inherited \""+_d5+"\" was found (declare.js)");return;}return fn.apply(this,a);}}});}if(!dojo._hasResource["dojo._base.connect"]){dojo._hasResource["dojo._base.connect"]=true;dojo.provide("dojo._base.connect");dojo._listener={getDispatcher:function(){return function(){var ap=Array.prototype,c=arguments.callee,ls=c._listeners,t=c.target;var r=t&&t.apply(this,arguments);for(var i in ls){if(!(i in ap)){ls[i].apply(this,arguments);}}return r;};},add:function(_e3,_e4,_e5){_e3=_e3||dojo.global;var f=_e3[_e4];if(!f||!f._listeners){var d=dojo._listener.getDispatcher();d.target=f;d._listeners=[];f=_e3[_e4]=d;}return f._listeners.push(_e5);},remove:function(_e8,_e9,_ea){var f=(_e8||dojo.global)[_e9];if(f&&f._listeners&&_ea--){delete f._listeners[_ea];}}};dojo.connect=function(obj,_ed,_ee,_ef,_f0){var a=arguments,_f2=[],i=0;_f2.push(dojo.isString(a[0])?null:a[i++],a[i++]);var a1=a[i+1];_f2.push(dojo.isString(a1)||dojo.isFunction(a1)?a[i++]:null,a[i++]);for(var l=a.length;i2){_115=dojo.partial(_115,arguments,2);}return this.addCallbacks(_115,_115);},addCallback:function(cb,cbfn){var _118=dojo.hitch(cb,cbfn);if(arguments.length>2){_118=dojo.partial(_118,arguments,2);}return this.addCallbacks(_118,null);},addErrback:function(cb,cbfn){var _11b=dojo.hitch(cb,cbfn);if(arguments.length>2){_11b=dojo.partial(_11b,arguments,2);}return this.addCallbacks(null,_11b);},addCallbacks:function(cb,eb){this.chain.push([cb,eb]);if(this.fired>=0){this._fire();}return this;},_fire:function(){var _11e=this.chain;var _11f=this.fired;var res=this.results[_11f];var self=this;var cb=null;while((_11e.length>0)&&(this.paused==0)){var f=_11e.shift()[_11f];if(!f){continue;}try{res=f(res);_11f=((res instanceof Error)?1:0);if(res instanceof dojo.Deferred){cb=function(res){self._resback(res);self.paused--;if((self.paused==0)&&(self.fired>=0)){self._fire();}};this.paused++;}}catch(err){console.debug(err);_11f=1;res=err;}}this.fired=_11f;this.results[_11f]=res;if((cb)&&(this.paused)){res.addBoth(cb);}}});}if(!dojo._hasResource["dojo._base.json"]){dojo._hasResource["dojo._base.json"]=true;dojo.provide("dojo._base.json");dojo.fromJson=function(json){try{return eval("("+json+")");}catch(e){console.debug(e);return json;}};dojo._escapeString=function(str){return ("\""+str.replace(/(["\\])/g,"\\$1")+"\"").replace(/[\f]/g,"\\f").replace(/[\b]/g,"\\b").replace(/[\n]/g,"\\n").replace(/[\t]/g,"\\t").replace(/[\r]/g,"\\r");};dojo.toJsonIndentStr="\t";dojo.toJson=function(it,_128,_129){_129=_129||"";var _12a=(_128?_129+dojo.toJsonIndentStr:"");var _12b=(_128?"\n":"");var _12c=typeof (it);if(_12c=="undefined"){return "undefined";}else{if((_12c=="number")||(_12c=="boolean")){return it+"";}else{if(it===null){return "null";}}}if(dojo.isString(it)){return dojo._escapeString(it);}if(it.nodeType&&it.cloneNode){return "";}var _12d=arguments.callee;var _12e;if(typeof it.__json__=="function"){_12e=it.__json__();if(it!==_12e){return _12d(_12e,_128,_12a);}}if(typeof it.json=="function"){_12e=it.json();if(it!==_12e){return _12d(_12e,_128,_12a);}}if(dojo.isArray(it)){var res=[];for(var i=0;i>=bits;t[x]=bits==4?17*c:c;});t.a=1;return t;};dojo.colorFromArray=function(a,obj){var t=obj||new dojo.Color();t._set(Number(a[0]),Number(a[1]),Number(a[2]),Number(a[3]));if(isNaN(t.a)){t.a=1;}return t.sanitize();};dojo.colorFromString=function(str,obj){var a=dojo.Color.named[str];return a&&dojo.colorFromArray(a,obj)||dojo.colorFromRgb(str,obj)||dojo.colorFromHex(str,obj);};}if(!dojo._hasResource["dojo._base"]){dojo._hasResource["dojo._base"]=true;dojo.provide("dojo._base");(function(){if(djConfig.require){for(var x=0;x90)&&(k<96||k>111)&&(k<186||k>192)&&(k<219||k>222);if(_1e9||evt.ctrlKey){var c=(_1e9?0:k);if(evt.ctrlKey){if(k==3||k==13){return;}else{if(c>95&&c<106){c-=48;}else{if((!evt.shiftKey)&&(c>=65&&c<=90)){c+=32;}else{c=del._punctMap[c]||c;}}}}var faux=del._synthesizeEvent(evt,{type:"keypress",faux:true,charCode:c});kp.call(evt.currentTarget,faux);evt.cancelBubble=faux.cancelBubble;evt.returnValue=faux.returnValue;_1c6(evt,faux.keyCode);}},_stopPropagation:function(){this.cancelBubble=true;},_preventDefault:function(){this.bubbledKeyCode=this.keyCode;if(this.ctrlKey){_1c6(this,0);}this.returnValue=false;}});dojo.stopEvent=function(evt){evt=evt||window.event;del._stopPropagation.call(evt);del._preventDefault.call(evt);};}del._synthesizeEvent=function(evt,_1ee){var faux=dojo.mixin({},evt,_1ee);del._setKeyChar(faux);faux.preventDefault=function(){evt.preventDefault();};faux.stopPropagation=function(){evt.stopPropagation();};return faux;};if(dojo.isOpera){dojo.mixin(del,{_fixEvent:function(evt,_1f1){switch(evt.type){case "keypress":var c=evt.which;if(c==3){c=99;}c=((c<41)&&(!evt.shiftKey)?0:c);if((evt.ctrlKey)&&(!evt.shiftKey)&&(c>=65)&&(c<=90)){c+=32;}return del._synthesizeEvent(evt,{charCode:c});}return evt;}});}if(dojo.isSafari){dojo.mixin(del,{_fixEvent:function(evt,_1f4){switch(evt.type){case "keypress":var c=evt.charCode,s=evt.shiftKey,k=evt.keyCode;k=k||_1f8[evt.keyIdentifier]||0;if(evt.keyIdentifier=="Enter"){c=0;}else{if((evt.ctrlKey)&&(c>0)&&(c<27)){c+=96;}else{if(c==dojo.keys.SHIFT_TAB){c=dojo.keys.TAB;s=true;}else{c=(c>=32&&c<63232?c:0);}}}return del._synthesizeEvent(evt,{charCode:c,shiftKey:s,keyCode:k});}return evt;}});dojo.mixin(dojo.keys,{SHIFT_TAB:25,UP_ARROW:63232,DOWN_ARROW:63233,LEFT_ARROW:63234,RIGHT_ARROW:63235,F1:63236,F2:63237,F3:63238,F4:63239,F5:63240,F6:63241,F7:63242,F8:63243,F9:63244,F10:63245,F11:63246,F12:63247,PAUSE:63250,DELETE:63272,HOME:63273,END:63275,PAGE_UP:63276,PAGE_DOWN:63277,INSERT:63302,PRINT_SCREEN:63248,SCROLL_LOCK:63249,NUM_LOCK:63289});var dk=dojo.keys,_1f8={"Up":dk.UP_ARROW,"Down":dk.DOWN_ARROW,"Left":dk.LEFT_ARROW,"Right":dk.RIGHT_ARROW,"PageUp":dk.PAGE_UP,"PageDown":dk.PAGE_DOWN};}})();if(dojo.isIE){dojo._getIeDispatcher=function(){return function(){var ap=Array.prototype,h=dojo._ie_listener.handlers,c=arguments.callee,ls=c._listeners,t=h[c.target];var r=t&&t.apply(this,arguments);for(var i in ls){if(!(i in ap)){h[ls[i]].apply(this,arguments);}}return r;};};dojo._event_listener._fixCallback=function(fp){var f=dojo._event_listener._fixEvent;return function(e){return fp.call(this,f(e,this));};};}}if(!dojo._hasResource["dojo._base.html"]){dojo._hasResource["dojo._base.html"]=true;dojo.provide("dojo._base.html");try{document.execCommand("BackgroundImageCache",false,true);}catch(e){}if(dojo.isIE||dojo.isOpera){dojo.byId=function(id,doc){if(dojo.isString(id)){var _d=doc||dojo.doc;var te=_d.getElementById(id);if(te&&te.attributes.id.value==id){return te;}else{var eles=_d.all[id];if(!eles){return;}if(!eles.length){return eles;}var i=0;while((te=eles[i++])){if(te.attributes.id.value==id){return te;}}}}else{return id;}};}else{dojo.byId=function(id,doc){if(dojo.isString(id)){return (doc||dojo.doc).getElementById(id);}else{return id;}};}(function(){var _20c=null;dojo._destroyElement=function(node){node=dojo.byId(node);try{if(!_20c){_20c=document.createElement("div");}_20c.appendChild(node.parentNode?node.parentNode.removeChild(node):node);_20c.innerHTML="";}catch(e){}};dojo.isDescendant=function(node,_20f){try{node=dojo.byId(node);_20f=dojo.byId(_20f);while(node){if(node===_20f){return true;}node=node.parentNode;}}catch(e){return -1;}return false;};dojo.setSelectable=function(node,_211){node=dojo.byId(node);if(dojo.isMozilla){node.style.MozUserSelect=_211?"":"none";}else{if(dojo.isKhtml){node.style.KhtmlUserSelect=_211?"auto":"none";}else{if(dojo.isIE){node.unselectable=_211?"":"on";dojo.query("*",node).forEach(function(_212){_212.unselectable=_211?"":"on";});}}}};var _213=function(node,ref){ref.parentNode.insertBefore(node,ref);return true;};var _216=function(node,ref){var pn=ref.parentNode;if(ref==pn.lastChild){pn.appendChild(node);}else{return _213(node,ref.nextSibling);}return true;};dojo.place=function(node,_21b,_21c){if(!node||!_21b||_21c===undefined){return false;}node=dojo.byId(node);_21b=dojo.byId(_21b);if(typeof _21c=="number"){var cn=_21b.childNodes;if((_21c==0&&cn.length==0)||cn.length==_21c){_21b.appendChild(node);return true;}if(_21c==0){return _213(node,_21b.firstChild);}return _216(node,cn[_21c-1]);}switch(_21c.toLowerCase()){case "before":return _213(node,_21b);case "after":return _216(node,_21b);case "first":if(_21b.firstChild){return _213(node,_21b.firstChild);}else{_21b.appendChild(node);return true;}break;default:_21b.appendChild(node);return true;}};dojo.boxModel="content-box";if(dojo.isIE){var _dcm=document.compatMode;dojo.boxModel=(_dcm=="BackCompat")||(_dcm=="QuirksMode")||(dojo.isIE<6)?"border-box":"content-box";}var gcs,dv=document.defaultView;if(dojo.isSafari){gcs=function(node){var s=dv.getComputedStyle(node,null);if(!s&&node.style){node.style.display="";s=dv.getComputedStyle(node,null);}return s||{};};}else{if(dojo.isIE){gcs=function(node){return node.currentStyle;};}else{gcs=function(node){return dv.getComputedStyle(node,null);};}}dojo.getComputedStyle=gcs;if(!dojo.isIE){dojo._toPixelValue=function(_225,_226){return parseFloat(_226)||0;};}else{dojo._toPixelValue=function(_227,_228){if(!_228){return 0;}if(_228=="medium"){return 4;}if(_228.slice&&(_228.slice(-2)=="px")){return parseFloat(_228);}with(_227){var _229=style.left;var _22a=runtimeStyle.left;runtimeStyle.left=currentStyle.left;try{style.left=_228;_228=style.pixelLeft;}catch(e){_228=0;}style.left=_229;runtimeStyle.left=_22a;}return _228;};}dojo._getOpacity=(dojo.isIE?function(node){try{return (node.filters.alpha.opacity/100);}catch(e){return 1;}}:function(node){return dojo.getComputedStyle(node).opacity;});dojo._setOpacity=(dojo.isIE?function(node,_22e){if(_22e==1){node.style.cssText=node.style.cssText.replace(/FILTER:[^;]*;/i,"");if(node.nodeName.toLowerCase()=="tr"){dojo.query("> td",node).forEach(function(i){i.style.cssText=i.style.cssText.replace(/FILTER:[^;]*;/i,"");});}}else{var o="Alpha(Opacity="+(_22e*100)+")";node.style.filter=o;}if(node.nodeName.toLowerCase()=="tr"){dojo.query("> td",node).forEach(function(i){i.style.filter=o;});}return _22e;}:function(node,_233){return node.style.opacity=_233;});var _234={width:true,height:true,left:true,top:true};var _235=function(node,type,_238){type=type.toLowerCase();if(_234[type]===true){return dojo._toPixelValue(node,_238);}else{if(_234[type]===false){return _238;}else{if(dojo.isOpera&&type=="cssText"){}if((type.indexOf("margin")>=0)||(type.indexOf("padding")>=0)||(type.indexOf("width")>=0)||(type.indexOf("height")>=0)||(type.indexOf("max")>=0)||(type.indexOf("min")>=0)||(type.indexOf("offset")>=0)){_234[type]=true;return dojo._toPixelValue(node,_238);}else{_234[type]=false;return _238;}}}};dojo.style=function(node,_23a,_23b){var n=dojo.byId(node),args=arguments.length,op=(_23a=="opacity");if(args==3){return op?dojo._setOpacity(n,_23b):n.style[_23a]=_23b;}if(args==2&&op){return dojo._getOpacity(n);}var s=dojo.getComputedStyle(n);return (args==1)?s:_235(n,_23a,s[_23a]);};dojo._getPadExtents=function(n,_241){var s=_241||gcs(n),px=dojo._toPixelValue,l=px(n,s.paddingLeft),t=px(n,s.paddingTop);return {l:l,t:t,w:l+px(n,s.paddingRight),h:t+px(n,s.paddingBottom)};};dojo._getBorderExtents=function(n,_247){var ne="none",px=dojo._toPixelValue,s=_247||gcs(n),bl=(s.borderLeftStyle!=ne?px(n,s.borderLeftWidth):0),bt=(s.borderTopStyle!=ne?px(n,s.borderTopWidth):0);return {l:bl,t:bt,w:bl+(s.borderRightStyle!=ne?px(n,s.borderRightWidth):0),h:bt+(s.borderBottomStyle!=ne?px(n,s.borderBottomWidth):0)};};dojo._getPadBorderExtents=function(n,_24e){var s=_24e||gcs(n),p=dojo._getPadExtents(n,s),b=dojo._getBorderExtents(n,s);return {l:p.l+b.l,t:p.t+b.t,w:p.w+b.w,h:p.h+b.h};};dojo._getMarginExtents=function(n,_253){var s=_253||gcs(n),px=dojo._toPixelValue,l=px(n,s.marginLeft),t=px(n,s.marginTop),r=px(n,s.marginRight),b=px(n,s.marginBottom);if(dojo.isSafari&&(s.position!="absolute")){r=l;}return {l:l,t:t,w:l+r,h:t+b};};dojo._getMarginBox=function(node,_25b){var s=_25b||gcs(node),me=dojo._getMarginExtents(node,s);var l=node.offsetLeft-me.l,t=node.offsetTop-me.t;if(dojo.isMoz){var sl=parseFloat(s.left),st=parseFloat(s.top);if(!isNaN(sl)&&!isNaN(st)){l=sl,t=st;}else{var p=node.parentNode;if(p&&p.style){var pcs=gcs(p);if(pcs.overflow!="visible"){var be=dojo._getBorderExtents(p,pcs);l+=be.l,t+=be.t;}}}}else{if(dojo.isOpera){var p=node.parentNode;if(p){var be=dojo._getBorderExtents(p);l-=be.l,t-=be.t;}}}return {l:l,t:t,w:node.offsetWidth+me.w,h:node.offsetHeight+me.h};};dojo._getContentBox=function(node,_266){var s=_266||gcs(node),pe=dojo._getPadExtents(node,s),be=dojo._getBorderExtents(node,s),w=node.clientWidth,h;if(!w){w=node.offsetWidth,h=node.offsetHeight;}else{h=node.clientHeight,be.w=be.h=0;}if(dojo.isOpera){pe.l+=be.l;pe.t+=be.t;}return {l:pe.l,t:pe.t,w:w-pe.w-be.w,h:h-pe.h-be.h};};dojo._getBorderBox=function(node,_26d){var s=_26d||gcs(node),pe=dojo._getPadExtents(node,s),cb=dojo._getContentBox(node,s);return {l:cb.l-pe.l,t:cb.t-pe.t,w:cb.w+pe.w,h:cb.h+pe.h};};dojo._setBox=function(node,l,t,w,h,u){u=u||"px";with(node.style){if(!isNaN(l)){left=l+u;}if(!isNaN(t)){top=t+u;}if(w>=0){width=w+u;}if(h>=0){height=h+u;}}};dojo._usesBorderBox=function(node){var n=node.tagName;return dojo.boxModel=="border-box"||n=="TABLE"||n=="BUTTON";};dojo._setContentSize=function(node,_27a,_27b,_27c){var bb=dojo._usesBorderBox(node);if(bb){var pb=dojo._getPadBorderExtents(node,_27c);if(_27a>=0){_27a+=pb.w;}if(_27b>=0){_27b+=pb.h;}}dojo._setBox(node,NaN,NaN,_27a,_27b);};dojo._setMarginBox=function(node,_280,_281,_282,_283,_284){var s=_284||dojo.getComputedStyle(node);var bb=dojo._usesBorderBox(node),pb=bb?_288:dojo._getPadBorderExtents(node,s),mb=dojo._getMarginExtents(node,s);if(_282>=0){_282=Math.max(_282-pb.w-mb.w,0);}if(_283>=0){_283=Math.max(_283-pb.h-mb.h,0);}dojo._setBox(node,_280,_281,_282,_283);};var _288={l:0,t:0,w:0,h:0};dojo.marginBox=function(node,box){var n=dojo.byId(node),s=gcs(n),b=box;return !b?dojo._getMarginBox(n,s):dojo._setMarginBox(n,b.l,b.t,b.w,b.h,s);};dojo.contentBox=function(node,box){var n=dojo.byId(node),s=gcs(n),b=box;return !b?dojo._getContentBox(n,s):dojo._setContentSize(n,b.w,b.h,s);};var _294=function(node,prop){if(!(node=(node||0).parentNode)){return 0;}var val,_298=0,_b=dojo.body();while(node&&node.style){if(gcs(node).position=="fixed"){return 0;}val=node[prop];if(val){_298+=val-0;if(node==_b){break;}}node=node.parentNode;}return _298;};dojo._docScroll=function(){var _b=dojo.body();var _w=dojo.global;var de=dojo.doc.documentElement;return {y:(_w.pageYOffset||de.scrollTop||_b.scrollTop||0),x:(_w.pageXOffset||dojo._fixIeBiDiScrollLeft(de.scrollLeft)||_b.scrollLeft||0)};};dojo._isBodyLtr=function(){return !("_bodyLtr" in dojo)?dojo._bodyLtr=dojo.getComputedStyle(dojo.body()).direction=="ltr":dojo._bodyLtr;};dojo._getIeDocumentElementOffset=function(){var de=dojo.doc.documentElement;if(dojo.isIE>=7){return {x:de.getBoundingClientRect().left,y:de.getBoundingClientRect().top};}else{return {x:dojo._isBodyLtr()||window.parent==window?de.clientLeft:de.offsetWidth-de.clientWidth-de.clientLeft,y:de.clientTop};}};dojo._fixIeBiDiScrollLeft=function(_29e){if(dojo.isIE&&!dojo._isBodyLtr()){var de=dojo.doc.documentElement;return _29e+de.clientWidth-de.scrollWidth;}return _29e;};dojo._abs=function(node,_2a1){var _2a2=node.ownerDocument;var ret={x:0,y:0};var _2a4=false;var db=dojo.body();if(dojo.isIE){var _2a6=node.getBoundingClientRect();var _2a7=dojo._getIeDocumentElementOffset();ret.x=_2a6.left-_2a7.x;ret.y=_2a6.top-_2a7.y;}else{if(_2a2["getBoxObjectFor"]){var bo=_2a2.getBoxObjectFor(node);ret.x=bo.x-_294(node,"scrollLeft");ret.y=bo.y-_294(node,"scrollTop");}else{if(node["offsetParent"]){_2a4=true;var _2a9;if(dojo.isSafari&&(gcs(node).position=="absolute")&&(node.parentNode==db)){_2a9=db;}else{_2a9=db.parentNode;}if(node.parentNode!=db){var nd=node;if(dojo.isOpera||(dojo.isSafari>=3)){nd=db;}ret.x-=_294(nd,"scrollLeft");ret.y-=_294(nd,"scrollTop");}var _2ab=node;do{var n=_2ab["offsetLeft"];if(!dojo.isOpera||n>0){ret.x+=isNaN(n)?0:n;}var m=_2ab["offsetTop"];ret.y+=isNaN(m)?0:m;_2ab=_2ab.offsetParent;}while((_2ab!=_2a9)&&_2ab);}else{if(node["x"]&&node["y"]){ret.x+=isNaN(node.x)?0:node.x;ret.y+=isNaN(node.y)?0:node.y;}}}}if(_2a4||_2a1){var _2ae=dojo._docScroll();var m=_2a4?(!_2a1?-1:0):1;ret.y+=m*_2ae.y;ret.x+=m*_2ae.x;}return ret;};dojo.coords=function(node,_2b0){var n=dojo.byId(node),s=gcs(n),mb=dojo._getMarginBox(n,s);var abs=dojo._abs(n,_2b0);mb.x=abs.x;mb.y=abs.y;return mb;};})();dojo.hasClass=function(node,_2b6){return ((" "+dojo.byId(node).className+" ").indexOf(" "+_2b6+" ")>=0);};dojo.addClass=function(node,_2b8){node=dojo.byId(node);var cls=node.className;if((" "+cls+" ").indexOf(" "+_2b8+" ")<0){node.className=cls+(cls?" ":"")+_2b8;}};dojo.removeClass=function(node,_2bb){node=dojo.byId(node);var t=dojo.trim((" "+node.className+" ").replace(" "+_2bb+" "," "));if(node.className!=t){node.className=t;}};dojo.toggleClass=function(node,_2be,_2bf){if(_2bf===undefined){_2bf=!dojo.hasClass(node,_2be);}dojo[_2bf?"addClass":"removeClass"](node,_2be);};}if(!dojo._hasResource["dojo._base.NodeList"]){dojo._hasResource["dojo._base.NodeList"]=true;dojo.provide("dojo._base.NodeList");(function(){var d=dojo;var tnl=function(arr){arr.constructor=dojo.NodeList;dojo._mixin(arr,dojo.NodeList.prototype);return arr;};dojo.NodeList=function(){return tnl(Array.apply(null,arguments));};dojo.NodeList._wrap=tnl;dojo.extend(dojo.NodeList,{slice:function(){var a=dojo._toArray(arguments);return tnl(a.slice.apply(this,a));},splice:function(){var a=dojo._toArray(arguments);return tnl(a.splice.apply(this,a));},concat:function(){var a=dojo._toArray(arguments,0,[this]);return tnl(a.concat.apply([],a));},indexOf:function(_2c6,_2c7){return d.indexOf(this,_2c6,_2c7);},lastIndexOf:function(){return d.lastIndexOf.apply(d,d._toArray(arguments,0,[this]));},every:function(_2c8,_2c9){return d.every(this,_2c8,_2c9);},some:function(_2ca,_2cb){return d.some(this,_2ca,_2cb);},map:function(func,obj){return d.map(this,func,obj,d.NodeList);},forEach:function(_2ce,_2cf){d.forEach(this,_2ce,_2cf);return this;},coords:function(){return d.map(this,d.coords);},style:function(){var aa=d._toArray(arguments,0,[null]);var s=this.map(function(i){aa[0]=i;return d.style.apply(d,aa);});return (arguments.length>1)?this:s;},styles:function(){d.deprecated("NodeList.styles","use NodeList.style instead","1.1");return this.style.apply(this,arguments);},addClass:function(_2d3){this.forEach(function(i){d.addClass(i,_2d3);});return this;},removeClass:function(_2d5){this.forEach(function(i){d.removeClass(i,_2d5);});return this;},place:function(_2d7,_2d8){var item=d.query(_2d7)[0];_2d8=_2d8||"last";for(var x=0;x"){_2fd+=" *";}_2fd+=" ";var ts=function(s,e){return d.trim(_2fd.slice(s,e));};var _301=[];var _302=-1;var _303=-1;var _304=-1;var _305=-1;var _306=-1;var inId=-1;var _308=-1;var lc="";var cc="";var _30b;var x=0;var ql=_2fd.length;var _30e=null;var _cp=null;var _310=function(){if(_308>=0){var tv=(_308==x)?null:ts(_308,x).toLowerCase();_30e[(">~+".indexOf(tv)<0)?"tag":"oper"]=tv;_308=-1;}};var _312=function(){if(inId>=0){_30e.id=ts(inId,x).replace(/\\/g,"");inId=-1;}};var _313=function(){if(_306>=0){_30e.classes.push(ts(_306+1,x).replace(/\\/g,""));_306=-1;}};var _314=function(){_312();_310();_313();};for(;x=0){if(cc=="]"){if(!_cp.attr){_cp.attr=ts(_302+1,x);}else{_cp.matchFor=ts((_304||_302+1),x);}var cmf=_cp.matchFor;if(cmf){if((cmf.charAt(0)=="\"")||(cmf.charAt(0)=="'")){_cp.matchFor=cmf.substring(1,cmf.length-1);}}_30e.attrs.push(_cp);_cp=null;_302=_304=-1;}else{if(cc=="="){var _316=("|~^$*".indexOf(lc)>=0)?lc:"";_cp.type=_316+cc;_cp.attr=ts(_302+1,x-_316.length);_304=x+1;}}}else{if(_303>=0){if(cc==")"){if(_305>=0){_cp.value=ts(_303+1,x);}_305=_303=-1;}}else{if(cc=="#"){_314();inId=x+1;}else{if(cc=="."){_314();_306=x;}else{if(cc==":"){_314();_305=x;}else{if(cc=="["){_314();_302=x;_cp={};}else{if(cc=="("){if(_305>=0){_cp={name:ts(_305+1,x),value:null};_30e.pseudos.push(_cp);}_303=x;}else{if(cc==" "&&lc!=cc){_314();if(_305>=0){_30e.pseudos.push({name:ts(_305+1,x)});}_30e.hasLoops=(_30e.pseudos.length||_30e.attrs.length||_30e.classes.length);_30e.query=ts(_30b,x);_30e.tag=(_30e["oper"])?null:(_30e.tag||"*");_301.push(_30e);_30e=null;}}}}}}}}}return _301;};var _317={"*=":function(attr,_319){return "[contains(@"+attr+", '"+_319+"')]";},"^=":function(attr,_31b){return "[starts-with(@"+attr+", '"+_31b+"')]";},"$=":function(attr,_31d){return "[substring(@"+attr+", string-length(@"+attr+")-"+(_31d.length-1)+")='"+_31d+"']";},"~=":function(attr,_31f){return "[contains(concat(' ',@"+attr+",' '), ' "+_31f+" ')]";},"|=":function(attr,_321){return "[contains(concat(' ',@"+attr+",' '), ' "+_321+"-')]";},"=":function(attr,_323){return "[@"+attr+"='"+_323+"']";}};var _324=function(_325,_326,_327,_328){d.forEach(_326.attrs,function(attr){var _32a;if(attr.type&&_325[attr.type]){_32a=_325[attr.type](attr.attr,attr.matchFor);}else{if(attr.attr.length){_32a=_327(attr.attr);}}if(_32a){_328(_32a);}});};var _32b=function(_32c){var _32d=".";var _32e=_2fc(d.trim(_32c));while(_32e.length){var tqp=_32e.shift();var _330;if(tqp.oper==">"){_330="/";tqp=_32e.shift();}else{_330="//";}_32d+=_330+tqp.tag;if(tqp.id){_32d+="[@id='"+tqp.id+"'][1]";}d.forEach(tqp.classes,function(cn){var cnl=cn.length;var _333=" ";if(cn.charAt(cnl-1)=="*"){_333="";cn=cn.substr(0,cnl-1);}_32d+="[contains(concat(' ',@class,' '), ' "+cn+_333+"')]";});_324(_317,tqp,function(_334){return "[@"+_334+"]";},function(_335){_32d+=_335;});}return _32d;};var _336={};var _337=function(path){if(_336[path]){return _336[path];}var doc=d.doc;var _33a=_32b(path);var tf=function(_33c){var ret=[];var _33e;try{_33e=doc.evaluate(_33a,_33c,null,XPathResult.ANY_TYPE,null);}catch(e){console.debug("failure in exprssion:",_33a,"under:",_33c);console.debug(e);}var _33f=_33e.iterateNext();while(_33f){ret.push(_33f);_33f=_33e.iterateNext();}return ret;};return _336[path]=tf;};var _340={};var _341={};var _342=function(_343,_344){if(!_343){return _344;}if(!_344){return _343;}return function(){return _343.apply(window,arguments)&&_344.apply(window,arguments);};};var _345=function(_346,_347,_348,idx){var nidx=idx+1;var _34b=(_347.length==nidx);var tqp=_347[idx];if(tqp.oper==">"){var ecn=_346[_2fb];if(!ecn||!ecn.length){return;}nidx++;_34b=(_347.length==nidx);var tf=_34f(_347[idx+1]);for(var x=0,ecnl=ecn.length,te;x=0);};},"^=":function(attr,_374){return function(elem){return (_36c(elem,attr).indexOf(_374)==0);};},"$=":function(attr,_377){var tval=" "+_377;return function(elem){var ea=" "+_36c(elem,attr);return (ea.lastIndexOf(_377)==(ea.length-_377.length));};},"~=":function(attr,_37c){var tval=" "+_37c+" ";return function(elem){var ea=" "+_36c(elem,attr)+" ";return (ea.indexOf(tval)>=0);};},"|=":function(attr,_381){var _382=" "+_381+"-";return function(elem){var ea=" "+(elem.getAttribute(attr,2)||"");return ((ea==_381)||(ea.indexOf(_382)==0));};},"=":function(attr,_386){return function(elem){return (_36c(elem,attr)==_386);};}};var _388={"first-child":function(name,_38a){return function(elem){if(elem.nodeType!=1){return false;}var fc=elem.previousSibling;while(fc&&(fc.nodeType!=1)){fc=fc.previousSibling;}return (!fc);};},"last-child":function(name,_38e){return function(elem){if(elem.nodeType!=1){return false;}var nc=elem.nextSibling;while(nc&&(nc.nodeType!=1)){nc=nc.nextSibling;}return (!nc);};},"empty":function(name,_392){return function(elem){var cn=elem.childNodes;var cnl=elem.childNodes.length;for(var x=cnl-1;x>=0;x--){var nt=cn[x].nodeType;if((nt==1)||(nt==3)){return false;}}return true;};},"not":function(name,_399){var ntf=_34f(_2fc(_399)[0]);return function(elem){return (!ntf(elem));};},"nth-child":function(name,_39d){var pi=parseInt;if(_39d=="odd"){return function(elem){return (((_361(elem))%2)==1);};}else{if((_39d=="2n")||(_39d=="even")){return function(elem){return ((_361(elem)%2)==0);};}else{if(_39d.indexOf("0n+")==0){var _3a1=pi(_39d.substr(3));return function(elem){return (elem.parentNode[_2fb][_3a1-1]===elem);};}else{if((_39d.indexOf("n+")>0)&&(_39d.length>3)){var _3a3=_39d.split("n+",2);var pred=pi(_3a3[0]);var idx=pi(_3a3[1]);return function(elem){return ((_361(elem)%pred)==idx);};}else{if(_39d.indexOf("n")==-1){var _3a1=pi(_39d);return function(elem){return (_361(elem)==_3a1);};}}}}}}};var _3a8=(d.isIE)?function(cond){var clc=cond.toLowerCase();return function(elem){return elem[cond]||elem[clc];};}:function(cond){return function(elem){return (elem&&elem.getAttribute&&elem.hasAttribute(cond));};};var _360=function(_3ae){var _3af=(_341[_3ae.query]||_340[_3ae.query]);if(_3af){return _3af;}var ff=null;if(_3ae.id){if(_3ae.tag!="*"){ff=_342(ff,function(elem){return (elem.tagName.toLowerCase()==_3ae.tag);});}}d.forEach(_3ae.classes,function(_3b2,idx,arr){var _3b5=_3b2.charAt(_3b2.length-1)=="*";if(_3b5){_3b2=_3b2.substr(0,_3b2.length-1);}var re=new RegExp("(?:^|\\s)"+_3b2+(_3b5?".*":"")+"(?:\\s|$)");ff=_342(ff,function(elem){return re.test(elem.className);});ff.count=idx;});d.forEach(_3ae.pseudos,function(_3b8){if(_388[_3b8.name]){ff=_342(ff,_388[_3b8.name](_3b8.name,_3b8.value));}});_324(_36f,_3ae,_3a8,function(_3b9){ff=_342(ff,_3b9);});if(!ff){ff=function(){return true;};}return _341[_3ae.query]=ff;};var _3ba={};var _354=function(_3bb,root){var fHit=_3ba[_3bb.query];if(fHit){return fHit;}if(_3bb.id&&!_3bb.hasLoops&&!_3bb.tag){return _3ba[_3bb.query]=function(root){return [d.byId(_3bb.id)];};}var _3bf=_360(_3bb);var _3c0;if(_3bb.tag&&_3bb.id&&!_3bb.hasLoops){_3c0=function(root){var te=d.byId(_3bb.id);if(_3bf(te)){return [te];}};}else{var tret;if(!_3bb.hasLoops){_3c0=function(root){var ret=[];var te,x=0,tret=root.getElementsByTagName(_3bb.tag);while(te=tret[x++]){ret.push(te);}return ret;};}else{_3c0=function(root){var ret=[];var te,x=0,tret=root.getElementsByTagName(_3bb.tag);while(te=tret[x++]){if(_3bf(te)){ret.push(te);}}return ret;};}}return _3ba[_3bb.query]=_3c0;};var _3cc={};var _3cd={"*":d.isIE?function(root){return root.all;}:function(root){return root.getElementsByTagName("*");},">":function(root){var ret=[];var te,x=0,tret=root[_2fb];while(te=tret[x++]){if(te.nodeType==1){ret.push(te);}}return ret;}};var _3d5=function(_3d6){var _3d7=_2fc(d.trim(_3d6));if(_3d7.length==1){var tt=_354(_3d7[0]);tt.nozip=true;return tt;}var sqf=function(root){var _3db=_3d7.slice(0);var _3dc;if(_3db[0].oper==">"){_3dc=[root];}else{_3dc=_354(_3db.shift())(root);}return _355(_3dc,_3db);};return sqf;};var _3dd=((document["evaluate"]&&!d.isSafari)?function(_3de){var _3df=_3de.split(" ");if((document["evaluate"])&&(_3de.indexOf(":")==-1)&&((true))){if(((_3df.length>2)&&(_3de.indexOf(">")==-1))||(_3df.length>3)||(_3de.indexOf("[")>=0)||((1==_3df.length)&&(0<=_3de.indexOf(".")))){return _337(_3de);}}return _3d5(_3de);}:_3d5);var _3e0=function(_3e1){if(_3cd[_3e1]){return _3cd[_3e1];}if(0>_3e1.indexOf(",")){return _3cd[_3e1]=_3dd(_3e1);}else{var _3e2=_3e1.split(/\s*,\s*/);var tf=function(root){var _3e5=0;var ret=[];var tp;while(tp=_3e2[_3e5++]){ret=ret.concat(_3dd(tp,tp.indexOf(" "))(root));}return ret;};return _3cd[_3e1]=tf;}};var _3e8=0;var _zip=function(arr){if(arr&&arr.nozip){return d.NodeList._wrap(arr);}var ret=new d.NodeList();if(!arr){return ret;}if(arr[0]){ret.push(arr[0]);}if(arr.length<2){return ret;}_3e8++;arr[0]["_zipIdx"]=_3e8;for(var x=1,te;te=arr[x];x++){if(arr[x]["_zipIdx"]!=_3e8){ret.push(te);}te["_zipIdx"]=_3e8;}return ret;};d.query=function(_3ee,root){if(_3ee.constructor==d.NodeList){return _3ee;}if(!d.isString(_3ee)){return new d.NodeList(_3ee);}if(d.isString(root)){root=d.byId(root);}return _zip(_3e0(_3ee)(root||d.doc));};d._filterQueryResult=function(_3f0,_3f1){var tnl=new d.NodeList();var ff=(_3f1)?_34f(_2fc(_3f1)[0]):function(){return true;};for(var x=0,te;te=_3f0[x];x++){if(ff(te)){tnl.push(te);}}return tnl;};})();}if(!dojo._hasResource["dojo._base.xhr"]){dojo._hasResource["dojo._base.xhr"]=true;dojo.provide("dojo._base.xhr");(function(){var _d=dojo;function setValue(obj,name,_3f9){var val=obj[name];if(_d.isString(val)){obj[name]=[val,_3f9];}else{if(_d.isArray(val)){val.push(_3f9);}else{obj[name]=_3f9;}}};dojo.formToObject=function(_3fb){var ret={};var iq="input:not([type=file]):not([type=submit]):not([type=image]):not([type=reset]):not([type=button]), select, textarea";_d.query(iq,_3fb).filter(function(node){return (!node.disabled);}).forEach(function(item){var _in=item.name;var type=(item.type||"").toLowerCase();if(type=="radio"||type=="checkbox"){if(item.checked){setValue(ret,_in,item.value);}}else{if(item.multiple){ret[_in]=[];_d.query("option",item).forEach(function(opt){if(opt.selected){setValue(ret,_in,opt.value);}});}else{setValue(ret,_in,item.value);if(type=="image"){ret[_in+".x"]=ret[_in+".y"]=ret[_in].x=ret[_in].y=0;}}}});return ret;};dojo.objectToQuery=function(map){var ec=encodeURIComponent;var ret="";var _406={};for(var x in map){if(map[x]!=_406[x]){if(_d.isArray(map[x])){for(var y=0;y0){setTimeout(_p,d);return _t;}_p();return _t;},_play:function(_46f){var _t=this;_t._startTime=new Date().valueOf();if(_t._paused){_t._startTime-=_t.duration*_t._percent;}_t._endTime=_t._startTime+_t.duration;_t._active=true;_t._paused=false;var _471=_t.curve.getValue(_t._percent);if(!_t._percent){if(!_t._startRepeatCount){_t._startRepeatCount=_t.repeat;}_t.fire("onBegin",[_471]);}_t.fire("onPlay",[_471]);_t._cycle();return _t;},pause:function(){this._stopTimer();if(!this._active){return this;}this._paused=true;this.fire("onPause",[this.curve.getValue(this._percent)]);return this;},gotoPercent:function(_472,_473){this._stopTimer();this._active=this._paused=true;this._percent=_472;if(_473){this.play();}return this;},stop:function(_474){if(!this._timer){return;}this._stopTimer();if(_474){this._percent=1;}this.fire("onStop",[this.curve.getValue(this._percent)]);this._active=this._paused=false;return this;},status:function(){if(this._active){return this._paused?"paused":"playing";}return "stopped";},_cycle:function(){var _t=this;if(_t._active){var curr=new Date().valueOf();var step=(curr-_t._startTime)/(_t._endTime-_t._startTime);if(step>=1){step=1;}_t._percent=step;if(_t.easing){step=_t.easing(step);}_t.fire("onAnimate",[_t.curve.getValue(step)]);if(step<1){_t._startTimer();}else{_t._active=false;if(_t.repeat>0){_t.repeat--;_t.play(null,true);}else{if(_t.repeat==-1){_t.play(null,true);}else{if(_t._startRepeatCount){_t.repeat=_t._startRepeatCount;_t._startRepeatCount=0;}}}_t._percent=0;_t.fire("onEnd");}}return _t;}});(function(){var d=dojo;var ctr=0;var _47a=[];var _47b={run:function(){}};var _47c=null;dojo._Animation.prototype._startTimer=function(){if(!this._timer){this._timer=dojo.connect(_47b,"run",this,"_cycle");ctr++;}if(!_47c){_47c=setInterval(dojo.hitch(_47b,"run"),this.rate);}};dojo._Animation.prototype._stopTimer=function(){dojo.disconnect(this._timer);this._timer=null;ctr--;if(!ctr){clearInterval(_47c);_47c=null;}};var _47d=(d.isIE)?function(node){var ns=node.style;if(!ns.zoom.length&&d.style(node,"zoom")=="normal"){ns.zoom="1";}if(!ns.width.length&&d.style(node,"width")=="auto"){ns.width="auto";}}:function(){};dojo._fade=function(args){args.node=d.byId(args.node);var _481=d.mixin({properties:{}},args);var _482=(_481.properties.opacity={});_482.start=!("start" in _481)?function(){return Number(d.style(_481.node,"opacity"));}:_481.start;_482.end=_481.end;var anim=d.animateProperty(_481);d.connect(anim,"beforeBegin",d.partial(_47d,_481.node));return anim;};dojo.fadeIn=function(args){return d._fade(d.mixin({end:1},args));};dojo.fadeOut=function(args){return d._fade(d.mixin({end:0},args));};dojo._defaultEasing=function(n){return 0.5+((Math.sin((n+1.5)*Math.PI))/2);};var _487=function(_488){this._properties=_488;for(var p in _488){var prop=_488[p];if(prop.start instanceof d.Color){prop.tempColor=new d.Color();}}this.getValue=function(r){var ret={};for(var p in this._properties){var prop=this._properties[p];var _48f=prop.start;if(_48f instanceof d.Color){ret[p]=d.blendColors(_48f,prop.end,r,prop.tempColor).toCss();}else{if(!d.isArray(_48f)){ret[p]=((prop.end-_48f)*r)+_48f+(p!="opacity"?prop.units||"px":"");}}}return ret;};};dojo.animateProperty=function(args){args.node=d.byId(args.node);if(!args.easing){args.easing=d._defaultEasing;}var anim=new d._Animation(args);d.connect(anim,"beforeBegin",anim,function(){var pm={};for(var p in this.properties){var prop=(pm[p]=d.mixin({},this.properties[p]));if(d.isFunction(prop.start)){prop.start=prop.start();}if(d.isFunction(prop.end)){prop.end=prop.end();}var _495=(p.toLowerCase().indexOf("color")>=0);function getStyle(node,p){var v=({height:node.offsetHeight,width:node.offsetWidth})[p];if(v!==undefined){return v;}v=d.style(node,p);return (p=="opacity")?Number(v):parseFloat(v);};if(!("end" in prop)){prop.end=getStyle(this.node,p);}else{if(!("start" in prop)){prop.start=getStyle(this.node,p);}}if(_495){prop.start=new d.Color(prop.start);prop.end=new d.Color(prop.end);}else{prop.start=(p=="opacity")?Number(prop.start):parseFloat(prop.start);}}this.curve=new _487(pm);});d.connect(anim,"onAnimate",anim,function(_499){for(var s in _499){d.style(this.node,s,_499[s]);}});return anim;};})();}if(!dojo._hasResource["dojo.i18n"]){dojo._hasResource["dojo.i18n"]=true;dojo.provide("dojo.i18n");dojo.i18n.getLocalization=function(_49b,_49c,_49d){_49d=dojo.i18n.normalizeLocale(_49d);var _49e=_49d.split("-");var _49f=[_49b,"nls",_49c].join(".");var _4a0=dojo._loadedModules[_49f];if(_4a0){var _4a1;for(var i=_49e.length;i>0;i--){var loc=_49e.slice(0,i).join("_");if(_4a0[loc]){_4a1=_4a0[loc];break;}}if(!_4a1){_4a1=_4a0.ROOT;}if(_4a1){var _4a4=function(){};_4a4.prototype=_4a1;return new _4a4();}}throw new Error("Bundle not found: "+_49c+" in "+_49b+" , locale="+_49d);};dojo.i18n.normalizeLocale=function(_4a5){var _4a6=_4a5?_4a5.toLowerCase():dojo.locale;if(_4a6=="root"){_4a6="ROOT";}return _4a6;};dojo.i18n._requireLocalization=function(_4a7,_4a8,_4a9,_4aa){var _4ab=dojo.i18n.normalizeLocale(_4a9);var _4ac=[_4a7,"nls",_4a8].join(".");var _4ad="";if(_4aa){var _4ae=_4aa.split(",");for(var i=0;i<_4ae.length;i++){if(_4ab.indexOf(_4ae[i])==0){if(_4ae[i].length>_4ad.length){_4ad=_4ae[i];}}}if(!_4ad){_4ad="ROOT";}}var _4b0=_4aa?_4ad:_4ab;var _4b1=dojo._loadedModules[_4ac];var _4b2=null;if(_4b1){if(djConfig.localizationComplete&&_4b1._built){return;}var _4b3=_4b0.replace(/-/g,"_");var _4b4=_4ac+"."+_4b3;_4b2=dojo._loadedModules[_4b4];}if(!_4b2){_4b1=dojo["provide"](_4ac);var syms=dojo._getModuleSymbols(_4a7);var _4b6=syms.concat("nls").join("/");var _4b7;dojo.i18n._searchLocalePath(_4b0,_4aa,function(loc){var _4b9=loc.replace(/-/g,"_");var _4ba=_4ac+"."+_4b9;var _4bb=false;if(!dojo._loadedModules[_4ba]){dojo["provide"](_4ba);var _4bc=[_4b6];if(loc!="ROOT"){_4bc.push(loc);}_4bc.push(_4a8);var _4bd=_4bc.join("/")+".js";_4bb=dojo._loadPath(_4bd,null,function(hash){var _4bf=function(){};_4bf.prototype=_4b7;_4b1[_4b9]=new _4bf();for(var j in hash){_4b1[_4b9][j]=hash[j];}});}else{_4bb=true;}if(_4bb&&_4b1[_4b9]){_4b7=_4b1[_4b9];}else{_4b1[_4b9]=_4b7;}if(_4aa){return true;}});}if(_4aa&&_4ab!=_4ad){_4b1[_4ab.replace(/-/g,"_")]=_4b1[_4ad.replace(/-/g,"_")];}};(function(){var _4c1=djConfig.extraLocale;if(_4c1){if(!_4c1 instanceof Array){_4c1=[_4c1];}var req=dojo.i18n._requireLocalization;dojo.i18n._requireLocalization=function(m,b,_4c5,_4c6){req(m,b,_4c5,_4c6);if(_4c5){return;}for(var i=0;i<_4c1.length;i++){req(m,b,_4c1[i],_4c6);}};}})();dojo.i18n._searchLocalePath=function(_4c8,down,_4ca){_4c8=dojo.i18n.normalizeLocale(_4c8);var _4cb=_4c8.split("-");var _4cc=[];for(var i=_4cb.length;i>0;i--){_4cc.push(_4cb.slice(0,i).join("-"));}_4cc.push(false);if(down){_4cc.reverse();}for(var j=_4cc.length-1;j>=0;j--){var loc=_4cc[j]||"ROOT";var stop=_4ca(loc);if(stop){break;}}};dojo.i18n._preloadLocalizations=function(_4d1,_4d2){function preload(_4d3){_4d3=dojo.i18n.normalizeLocale(_4d3);dojo.i18n._searchLocalePath(_4d3,true,function(loc){for(var i=0;i<_4d2.length;i++){if(_4d2[i]==loc){dojo["require"](_4d1+"_"+loc);return true;}}return false;});};preload();var _4d6=djConfig.extraLocale||[];for(var i=0;i<_4d6.length;i++){preload(_4d6[i]);}};}if(!dojo._hasResource["dijit._base.focus"]){dojo._hasResource["dijit._base.focus"]=true;dojo.provide("dijit._base.focus");dojo.mixin(dijit,{_curFocus:null,_prevFocus:null,isCollapsed:function(){var _4d8=dojo.global;var _4d9=dojo.doc;if(_4d9.selection){return !_4d9.selection.createRange().text;}else{if(_4d8.getSelection){var _4da=_4d8.getSelection();if(dojo.isString(_4da)){return !_4da;}else{return _4da.isCollapsed||!_4da.toString();}}}},getBookmark:function(){var _4db,_4dc=dojo.doc.selection;if(_4dc){var _4dd=_4dc.createRange();if(_4dc.type.toUpperCase()=="CONTROL"){_4db=_4dd.length?dojo._toArray(_4dd):null;}else{_4db=_4dd.getBookmark();}}else{if(dojo.global.getSelection){_4dc=dojo.global.getSelection();if(_4dc){var _4dd=_4dc.getRangeAt(0);_4db=_4dd.cloneRange();}}else{console.debug("No idea how to store the current selection for this browser!");}}return _4db;},moveToBookmark:function(_4de){var _4df=dojo.doc;if(_4df.selection){var _4e0;if(dojo.isArray(_4de)){_4e0=_4df.body.createControlRange();dojo.forEach(_4de,_4e0.addElement);}else{_4e0=_4df.selection.createRange();_4e0.moveToBookmark(_4de);}_4e0.select();}else{var _4e1=dojo.global.getSelection&&dojo.global.getSelection();if(_4e1&&_4e1.removeAllRanges){_4e1.removeAllRanges();_4e1.addRange(_4de);}else{console.debug("No idea how to restore selection for this browser!");}}},getFocus:function(menu,_4e3){return {node:menu&&dojo.isDescendant(dijit._curFocus,menu.domNode)?dijit._prevFocus:dijit._curFocus,bookmark:!dojo.withGlobal(_4e3||dojo.global,dijit.isCollapsed)?dojo.withGlobal(_4e3||dojo.global,dijit.getBookmark):null,openedForWindow:_4e3};},focus:function(_4e4){if(!_4e4){return;}var node="node" in _4e4?_4e4.node:_4e4,_4e6=_4e4.bookmark,_4e7=_4e4.openedForWindow;if(node){var _4e8=(node.tagName.toLowerCase()=="iframe")?node.contentWindow:node;if(_4e8&&_4e8.focus){try{_4e8.focus();}catch(e){}}dijit._onFocusNode(node);}if(_4e6&&dojo.withGlobal(_4e7||dojo.global,dijit.isCollapsed)){if(_4e7){_4e7.focus();}try{dojo.withGlobal(_4e7||dojo.global,moveToBookmark,null,[_4e6]);}catch(e){}}},_activeStack:[],registerWin:function(_4e9){if(!_4e9){_4e9=window;}dojo.connect(_4e9.document,"onmousedown",null,function(evt){dijit._justMouseDowned=true;setTimeout(function(){dijit._justMouseDowned=false;},0);dijit._onTouchNode(evt.target||evt.srcElement);});var body=_4e9.document.body||_4e9.document.getElementsByTagName("body")[0];if(body){if(dojo.isIE){body.attachEvent("onactivate",function(evt){if(evt.srcElement.tagName.toLowerCase()!="body"){dijit._onFocusNode(evt.srcElement);}});body.attachEvent("ondeactivate",function(evt){dijit._onBlurNode(evt.srcElement);});}else{body.addEventListener("focus",function(evt){dijit._onFocusNode(evt.target);},true);body.addEventListener("blur",function(evt){dijit._onBlurNode(evt.target);},true);}}body=null;},_onBlurNode:function(node){dijit._prevFocus=dijit._curFocus;dijit._curFocus=null;var w=dijit.getEnclosingWidget(node);if(w&&w._setStateClass){w._focused=false;w._setStateClass();}if(dijit._justMouseDowned){return;}if(dijit._clearActiveWidgetsTimer){clearTimeout(dijit._clearActiveWidgetsTimer);}dijit._clearActiveWidgetsTimer=setTimeout(function(){delete dijit._clearActiveWidgetsTimer;dijit._setStack([]);},100);},_onTouchNode:function(node){if(dijit._clearActiveWidgetsTimer){clearTimeout(dijit._clearActiveWidgetsTimer);delete dijit._clearActiveWidgetsTimer;}var _4f3=[];try{while(node){if(node.dijitPopupParent){node=dijit.byId(node.dijitPopupParent).domNode;}else{if(node.tagName&&node.tagName.toLowerCase()=="body"){if(node===dojo.body()){break;}node=dojo.query("iframe").filter(function(_4f4){return _4f4.contentDocument.body===node;})[0];}else{var id=node.getAttribute&&node.getAttribute("widgetId");if(id){_4f3.unshift(id);}node=node.parentNode;}}}}catch(e){}dijit._setStack(_4f3);},_onFocusNode:function(node){if(node&&node.tagName&&node.tagName.toLowerCase()=="body"){return;}dijit._onTouchNode(node);if(node==dijit._curFocus){return;}dijit._prevFocus=dijit._curFocus;dijit._curFocus=node;dojo.publish("focusNode",[node]);var w=dijit.getEnclosingWidget(node);if(w&&w._setStateClass){w._focused=true;w._setStateClass();}},_setStack:function(_4f8){var _4f9=dijit._activeStack;dijit._activeStack=_4f8;for(var _4fa=0;_4fa=_4fa;i--){var _4fc=dijit.byId(_4f9[i]);if(_4fc){dojo.publish("widgetBlur",[_4fc]);if(_4fc._onBlur){_4fc._onBlur();}}}for(var i=_4fa;i<_4f8.length;i++){var _4fc=dijit.byId(_4f8[i]);if(_4fc){dojo.publish("widgetFocus",[_4fc]);if(_4fc._onFocus){_4fc._onFocus();}}}}});dojo.addOnLoad(dijit.registerWin);}if(!dojo._hasResource["dijit._base.manager"]){dojo._hasResource["dijit._base.manager"]=true;dojo.provide("dijit._base.manager");dojo.declare("dijit.WidgetSet",null,{constructor:function(){this._hash={};},add:function(_4fd){if(this._hash[_4fd.id]){throw new Error("Tried to register widget with id=="+_4fd.id+" but that id is already registered");}this._hash[_4fd.id]=_4fd;},remove:function(id){delete this._hash[id];},forEach:function(func){for(var id in this._hash){func(this._hash[id]);}},filter:function(_501){var res=new dijit.WidgetSet();this.forEach(function(_503){if(_501(_503)){res.add(_503);}});return res;},byId:function(id){return this._hash[id];},byClass:function(cls){return this.filter(function(_506){return _506.declaredClass==cls;});}});dijit.registry=new dijit.WidgetSet();dijit._widgetTypeCtr={};dijit.getUniqueId=function(_507){var id;do{id=_507+"_"+(dijit._widgetTypeCtr[_507]!==undefined?++dijit._widgetTypeCtr[_507]:dijit._widgetTypeCtr[_507]=0);}while(dijit.byId(id));return id;};if(dojo.isIE){dojo.addOnUnload(function(){dijit.registry.forEach(function(_509){_509.destroy();});});}dijit.byId=function(id){return (dojo.isString(id))?dijit.registry.byId(id):id;};dijit.byNode=function(node){return dijit.registry.byId(node.getAttribute("widgetId"));};dijit.getEnclosingWidget=function(node){while(node){if(node.getAttribute&&node.getAttribute("widgetId")){return dijit.registry.byId(node.getAttribute("widgetId"));}node=node.parentNode;}return null;};}if(!dojo._hasResource["dijit._base.place"]){dojo._hasResource["dijit._base.place"]=true;dojo.provide("dijit._base.place");dijit.getViewport=function(){var _50d=dojo.global;var _50e=dojo.doc;var w=0,h=0;if(dojo.isMozilla){var minw,minh,maxw,maxh;if(_50e.body.clientWidth>_50e.documentElement.clientWidth){minw=_50e.documentElement.clientWidth;maxw=_50e.body.clientWidth;}else{maxw=_50e.documentElement.clientWidth;minw=_50e.body.clientWidth;}if(_50e.body.clientHeight>_50e.documentElement.clientHeight){minh=_50e.documentElement.clientHeight;maxh=_50e.body.clientHeight;}else{maxh=_50e.documentElement.clientHeight;minh=_50e.body.clientHeight;}w=(maxw>_50d.innerWidth)?minw:maxw;h=(maxh>_50d.innerHeight)?minh:maxh;}else{if(!dojo.isOpera&&_50d.innerWidth){w=_50d.innerWidth;h=_50d.innerHeight;}else{if(dojo.isIE&&_50e.documentElement&&_50e.documentElement.clientHeight){w=_50e.documentElement.clientWidth;h=_50e.documentElement.clientHeight;}else{if(dojo.body().clientWidth){w=dojo.body().clientWidth;h=dojo.body().clientHeight;}}}}var _515=dojo._docScroll();return {w:w,h:h,l:_515.x,t:_515.y};};dijit.placeOnScreen=function(node,pos,_518,_519){var _51a=dojo.map(_518,function(_51b){return {corner:_51b,pos:pos};});return dijit._place(node,_51a);};dijit._place=function(node,_51d,_51e){var view=dijit.getViewport();if(!node.parentNode||String(node.parentNode.tagName).toLowerCase()!="body"){dojo.body().appendChild(node);}var best=null;for(var i=0;i<_51d.length;i++){var _522=_51d[i].corner;var pos=_51d[i].pos;if(_51e){_51e(_522);}var _524=node.style.display;var _525=node.style.visibility;node.style.visibility="hidden";node.style.display="";var mb=dojo.marginBox(node);node.style.display=_524;node.style.visibility=_525;var _527=(_522.charAt(1)=="L"?pos.x:Math.max(view.l,pos.x-mb.w)),_528=(_522.charAt(0)=="T"?pos.y:Math.max(view.t,pos.y-mb.h)),endX=(_522.charAt(1)=="L"?Math.min(view.l+view.w,_527+mb.w):pos.x),endY=(_522.charAt(0)=="T"?Math.min(view.t+view.h,_528+mb.h):pos.y),_52b=endX-_527,_52c=endY-_528,_52d=(mb.w-_52b)+(mb.h-_52c);if(best==null||_52d0&&_53d[pi].parent===_53d[pi-1].widget;pi--){}return _53d[pi];};_548.push(dojo.connect(_545,"onkeypress",this,function(evt){if(evt.keyCode==dojo.keys.ESCAPE&&args.onCancel){args.onCancel();}else{if(evt.keyCode==dojo.keys.TAB){dojo.stopEvent(evt);var _54b=getTopPopup();if(_54b&&_54b.onCancel){_54b.onCancel();}}}}));if(_541.onCancel){_548.push(dojo.connect(_541,"onCancel",null,args.onCancel));}_548.push(dojo.connect(_541,_541.onExecute?"onExecute":"onChange",null,function(){var _54c=getTopPopup();if(_54c&&_54c.onExecute){_54c.onExecute();}}));_53d.push({wrapper:_545,iframe:_546,widget:_541,parent:args.parent,onExecute:args.onExecute,onCancel:args.onCancel,onClose:args.onClose,handlers:_548});if(_541.onOpen){_541.onOpen(best);}return best;};this.close=function(_54d){while(dojo.some(_53d,function(elem){return elem.widget==_54d;})){var top=_53d.pop(),_550=top.wrapper,_551=top.iframe,_552=top.widget,_553=top.onClose;if(_552.onClose){_552.onClose();}dojo.forEach(top.handlers,dojo.disconnect);if(!_552||!_552.domNode){return;}dojo.style(_552.domNode,"display","none");dojo.body().appendChild(_552.domNode);_551.destroy();dojo._destroyElement(_550);if(_553){_553();}}};}();dijit._frames=new function(){var _554=[];this.pop=function(){var _555;if(_554.length){_555=_554.pop();_555.style.display="";}else{if(dojo.isIE){var html="