Changeset 234

Timestamp:

10/26/11 17:22:50 (13 years ago)

Author:

vmipsl

Message:

Look apple

Location:

ether_megapoli/trunk/web

Files:

• resources/css/etherApple.css (modified) (1 diff)
• resources/css/select.css (modified) (3 diffs)
• resources/css/visu_parameter_by_pf.css (modified) (1 diff)
• resources/js/classesForJQuery/Button.js (copied) (copied from ether_megapoli/trunk/web/resources/js/classesForPrototype/Button.js) (8 diffs)
• resources/js/classesForJQuery/ComplexButton.js (modified) (1 diff)
• resources/js/classesForJQuery/Loading.js (copied) (copied from ether_megapoli/trunk/web/resources/js/Loading.js) (4 diffs)
• resources/js/classesForJQuery/Select.js (added)
• resources/js/classesForJQuery/etherClasses.js (moved) (moved from ether_megapoli/trunk/web/resources/js/etherClasses.js) (12 diffs)
• resources/js/classesForJQuery/etherHelper.js (added)
• resources/js/classesForPrototype/Loading.js (moved) (moved from ether_megapoli/trunk/web/resources/js/Loading.js)
• resources/js/classesForPrototype/Request.js (moved) (moved from ether_megapoli/trunk/web/resources/js/Request.js)
• resources/js/classesForPrototype/Select.js (moved) (moved from ether_megapoli/trunk/web/resources/js/Select.js)
• resources/js/classesForPrototype/etherClasses.js (copied) (copied from ether_megapoli/trunk/web/resources/js/etherClasses.js) (2 diffs)
• resources/js/classesForPrototype/etherHelper.js (moved) (moved from ether_megapoli/trunk/web/resources/js/etherHelper.js)
• resources/jsp/apple_etherHead.jsp (modified) (4 diffs)
• resources/templates/appleTemplate.jsp (modified) (3 diffs)
• src/com/ether/Controller.java (modified) (4 diffs)
• visualization/inWork.jsp (modified) (2 diffs)
• visualization/nav_visu.jsp (deleted)
• visualization/nav_visu_parameter.jsp (deleted)
• visualization/visu_parameter_by_pf-script.jsp (modified) (21 diffs)
• visualization/visu_parameter_by_pf.jsp (modified) (5 diffs)

ether_megapoli/trunk/web/resources/css/etherApple.css

@@ -106 +106 @@
 /** ************************************ **/
 .loading-classic {
-    background-image: url(../../resources/icons/loading.gif);
-    height: 35px;
-    width: 35px;
+    background-image: url(../../resources/icons/transparent_loading.gif);
+    height: 16px;
+    width: 16px;
 }

ether_megapoli/trunk/web/resources/css/select.css

@@ -7 +7 @@
 
 .select_selectLeft {
-    background: url(../images/select_left.gif) no-repeat top left;
+    background: url(../images/elements/select_left.gif) no-repeat top left;
     height: 20px;
     width: 6px;
@@ -14 +14 @@
 
 .select_selectMiddle {
-    background: transparent url(../images/select_middle.gif) repeat-x;
+    background: transparent url(../images/elements/select_middle.gif) repeat-x;
     height: 20px;
     float: left;
@@ -28 +28 @@
 
 .select_selectRight {
-    background: url(../images/select_right.gif) no-repeat top right;
+    background: url(../images/elements/select_right.gif) no-repeat top right;
     height: 20px;
     width: 20px;

ether_megapoli/trunk/web/resources/css/visu_parameter_by_pf.css

@@ -38 +38 @@
 #loadingForPlateforms, #loadingForParameters {
     position: relative;
-    top: 102px;
-    left: 100px;
+    top: 105px;
+    left: 91px;
 }
 

ether_megapoli/trunk/web/resources/js/classesForJQuery/Button.js

@@ -3 +3 @@
 // Display a button
 //
+// use JQuery
 // str value: Value to display in the button
 // dom parent: in which dom element to draw the button
@@ -31 +32 @@
         if( this.className )
             this.divContainer.className = this.className;
-        this.divContainer.atMe = this;
-        this.divContainer.id = this.id;
+        this.divContainer.attr( {id:this.id} );
         if( this.parent )
-            this.parent.appendChild( this.divContainer );
+            this.parent.append( this.divContainer );
 
         this.divText = $( document.createElement( "div" ) );
         if( this.classNameText )
             this.divText.className = "button_text";
-        this.divText.innerHTML = this.value;
-        this.divContainer.appendChild( this.divText );
+        this.divText.html( this.value );
+        this.divContainer.append( this.divText );
 
         // Define button events
-        Event.observe( this.divContainer, 'click', this.onClick.bindAsEventListener( this ) );
-        Event.observe( this.divContainer, 'mouseover', this.onHover.bindAsEventListener( this ) );
-        Event.observe( this.divContainer, 'mouseout', this.onOut.bindAsEventListener( this ) );
+        this.divContainer.bind( 'click', this, this.onClick );
+        this.divContainer.bind( 'mouseover', this, this.onHover );
+        this.divContainer.bind( 'mouseout', this, this.onOut );
     },
 
@@ -68 +68 @@
     {
         this.value = value;
-        this.divText.innerHTML = this.value;
+        this.divText.html( this.value );
     },
 
@@ -77 +77 @@
 
     // Actions ********************************************************
-
     disable : function()
     {
         this.boolDisabled = true;
-        this.divContainer.addClassName( "disable" );
+        this.divContainer.addClass( "disable" );
     },
 
@@ -87 +86 @@
     {
         this.boolDisabled = false;
-        this.divContainer.removeClassName( "disable" );
+        this.divContainer.removeClass( "disable" );
     },
 
@@ -94 +93 @@
         this.boolSelected = value;
         if( this.boolSelected )
-            this.divContainer.addClassName( "selected" );
+            this.divContainer.addClass( "selected" );
         else
-            this.divContainer.removeClassName( "selected" );
+            this.divContainer.removeClass( "selected" );
     },
 
@@ -102 +101 @@
     {
         this.boolDisplayed = true;
-        this.divContainer.style.display = "";
+        this.divContainer.show();
     },
 
@@ -108 +107 @@
     {
         this.boolDisplayed = false;
-        this.divContainer.style.display = "none";
+        this.divContainer.hide();
     },
 
     // Events ********************************************************
-
     onClick : function( event )
     {
-        if( !this.isDisable() && (undefined == event.detail || 1 == event.detail) )
-        {
-            if( this.callbackOnClick )
-                this.callbackOnClick();
-        }
-        Event.stop( event );
+        var contextButton = event.data;
+        if( !contextButton.isDisable() && (undefined == event.detail || 1 == event.detail) && contextButton.callbackOnClick )
+            contextButton.callbackOnClick();
     },
 
     onHover : function( event )
     {
-        if( !this.isDisable() && this.callbackOnMouseOver )
-            this.callbackOnMouseOver();
-
-        Event.stop( event );
+        var contextButton = event.data;
+        if( !contextButton.isDisable() && contextButton.callbackOnMouseOver )
+            contextButton.callbackOnMouseOver();
     },
 
-    onOut: function()
+    onOut: function( event )
     {
-        if( !this.isDisable() && this.callbackOnMouseOut )
-            this.callbackOnMouseOut();
+        var contextButton = event.data;
+        if( !contextButton.isDisable() && contextButton.callbackOnMouseOut )
+            contextButton.callbackOnMouseOut();
     }
 } );

ether_megapoli/trunk/web/resources/js/classesForJQuery/ComplexButton.js

@@ -152 +152 @@
     onClick : function( event )
     {
-        var contextButton = event.data;
-        if( !contextButton.getDisable() && (undefined == event.detail || 1 == event.detail) && contextButton.callbackOnClick )
-            contextButton.callbackOnClick();
+        var contextEvent = event.data;
+        if( !contextEvent.getDisable() && (undefined == event.detail || 1 == event.detail) && contextButton.callbackOnClick )
+            contextEvent.callbackOnClick();
     }
 } );

ether_megapoli/trunk/web/resources/js/classesForJQuery/Loading.js

@@ -1 +1 @@
 //******************************************************************************
 // Loading interface
+//
+// use JQuery
 // parameters :
 // parent : specify the parent of loading component
@@ -6 +8 @@
 //******************************************************************************
 
-var Loading = Class.create({
+var Loading = Class.create( {
 
     initialize:function( parameters )
@@ -15 +17 @@
 
         //Create loading component
-        this.loadingDiv = document.createElement("div");
-        this.loadingDiv.id = this.id;
-        this.loadingDiv.className = "loading-classic";
-        this.parent.appendChild(this.loadingDiv);
+        this.loadingDiv = $( document.createElement( "div" ) );
+        this.loadingDiv.attr( {id:this.id, class:"loading-classic"} );
+        this.parent.append( this.loadingDiv );
         this.hide();
     } ,
@@ -24 +25 @@
     display:function()
     {
-        this.loadingDiv.style.display = "";
+        this.loadingDiv.show();
     },
 
     hide:function()
     {
-        this.loadingDiv.style.display = "none";
+        this.loadingDiv.hide();
     }
-}) ;
+} );

ether_megapoli/trunk/web/resources/js/classesForJQuery/etherClasses.js

@@ -6 +6 @@
     initialize: function( plateforms, objectParameter )
     {
-        this.array = $A();
-        $A( plateforms ).each( function( jsonObject )
-        {
-            this.addItem( jsonObject, objectParameter );
-        }.bind( this ) );
+        this.array = [];
+        jQuery.each( plateforms,
+                jQuery.proxy( function( i, jsonObject )
+                {
+                    this.addItem( jsonObject, objectParameter );
+                }, this ) );
     },
 
@@ -31 +32 @@
     addOpenListener : function( func )
     {
-        this.array.each( function( objectItem )
+        jQuery.each( this.array, function( i, objectItem )
         {
             objectItem.divItem.addOpenListener( func );
@@ -44 +45 @@
             divNoItem.id = idIfNoItem;
             divNoItem.textContent = textIfNoItem;
-            parentNode.appendChild( divNoItem );
+            parentNode.append( divNoItem );
         }
         else
-            this.array.each( function( item )
+            jQuery.each( this.array, function( item )
             {
                 item.divItem.display( parentNode );
@@ -55 +56 @@
     displayWithPairImpair : function( parentNode, idIfNoItem, textIfNoItem )
     {
-        Dom.clearContainer( parentNode );
-        if( 0 >= this.array.size() )
+        parentNode.empty();
+//        Dom.clearContainer( parentNode );
+        if( 0 >= this.array.length )
         {
             var divNoItem = $( document.createElement( "div" ) );
             divNoItem.id = idIfNoItem;
             divNoItem.textContent = textIfNoItem;
-            parentNode.appendChild( divNoItem );
+            parentNode.append( divNoItem );
         }
         else
         {
             var rowNumber = 0;
-            this.array.each( function( item )
+            jQuery.each( this.array, function( i, item )
             {
                 if( rowNumber % 2 == 0 )
@@ -80 +82 @@
     {
         var returnObj = false;
-        this.array.each( function( objItem )
+        jQuery.each( this.array, jQuery.proxy( function( i, objItem )
         {
             if( objItem.jsonElement.id == itemId )
                 returnObj = objItem;
-        }.bind( this ) );
+        }, this ) );
 
         return returnObj;
@@ -98 +100 @@
     initialize: function( jsonElement, objectParameter )
     {
-        this.jsonElement = Object.clone( jsonElement ); // Warning: This is only a shallow copy
-        this.listeners = $A();
-
-        // HACK: No deep copy in Javascript
+        this.jsonElement = jsonElement;
+        this.listeners = [];
+
         if( objectParameter )
         {
             this.language = objectParameter.language || "fr";
-            if( objectParameter.currentTitleId )
-                this.currentTitleId = objectParameter.currentTitleId;
-            if( objectParameter.isExpiredTitle )
-                this.isExpiredTitle = objectParameter.isExpiredTitle;
             this.onMouseOverContainer = objectParameter.onMouseOverContainer ? objectParameter.onMouseOverContainer : false;
             this.onMouseOutContainer = objectParameter.onMouseOutContainer ? objectParameter.onMouseOutContainer : false;
@@ -129 +126 @@
         this.divContainer.item = this;
         if( classNameValue )
-            this.divContainer.className = classNameValue;
-        this.divContainer.id = containerName + "_" + this.jsonElement.id;
+            this.divContainer.addClass( classNameValue );
+        this.divContainer.attr( {id:containerName + "_" + this.jsonElement.id} );
     },
 
@@ -136 +133 @@
     {
         this.parentNode = parentNode;
-        parentNode.appendChild( this.divContainer );
+        parentNode.append( this.divContainer );
     },
 
     onHoverContainer: function( event )
     {
+        var contextEvent = event.data;
         if( !event || (event.detail == undefined || 1 == event.detail) )
-            this.executeListenersFunction();
+            contextEvent.executeListenersFunction();
     },
 
     onClickContainer: function( event )
     {
+        var contextEvent = event.data;
         if( !event || (event.detail == undefined || 1 == event.detail) )
-            this.executeListenersFunction();
+            contextEvent.executeListenersFunction();
     },
 
@@ -154 +153 @@
     {
         if( classNameValue )
-            this.divContainer.addClassName( classNameValue );
+            this.divContainer.addClass( classNameValue );
     },
 
@@ -160 +159 @@
     {
         if( classNameValue )
-            this.divContainer.removeClassName( classNameValue );
+            this.divContainer.removeClass( classNameValue );
     },
 
     executeListenersFunction: function()
     {
-        this.listeners.each( function ( func )
+        jQuery.each( this.listeners, jQuery.proxy( function ( i, func )
         {
             func( this );
-        }.bind( this ) );
+        }, this ) );
     },
 
@@ -174 +173 @@
     {
         if( this.divContainer )
-            Event.observe( this.divContainer, 'click', this.onClickContainer.bindAsEventListener( this ) );
+            this.divContainer.bind( 'click', this, this.onClickContainer );
         if( this.divContainer && this.onMouseOverContainer )
-            Event.observe( this.divContainer, 'mouseover', this.onMouseOverContainer.bindAsEventListener( this ) );
+            this.divContainer.bind( 'mouseover', this, this.onMouseOverContainer );
         if( this.divContainer && this.onMouseOutContainer )
-            Event.observe( this.divContainer, 'mouseout', this.onMouseOutContainer.bindAsEventListener( this ) );
+            this.divContainer.bind( 'mouseout', this, this.onMouseOutContainer );
     },
 
@@ -192 +191 @@
 
         this.divName = $( document.createElement( "div" ) );
-        this.divName.className = classNameValue;
-        this.divName.innerHTML = this.jsonElement.name;
-
-        this.divContainer.appendChild( this.divName );
+        this.divName.addClass( classNameValue );
+        this.divName.html( this.jsonElement.name );
+
+        this.divContainer.append( this.divName );
     },
 

ether_megapoli/trunk/web/resources/js/classesForPrototype/etherClasses.js

@@ -6 +6 @@
     initialize: function( plateforms, objectParameter )
     {
-        this.array = $A();
+        this.array = $A("");
         $A( plateforms ).each( function( jsonObject )
         {
@@ -99 +99 @@
     {
         this.jsonElement = Object.clone( jsonElement ); // Warning: This is only a shallow copy
-        this.listeners = $A();
+        this.listeners = $A("");
 
         // HACK: No deep copy in Javascript

ether_megapoli/trunk/web/resources/jsp/apple_etherHead.jsp

@@ -28 +28 @@
         {
             this.containerTitle.addClass( "containerTitle" );
-            this.containerTitle.html( interfaceTexts["app.fulltitle"] );
+            this.containerTitle.html( templateTexts["app.fulltitle"] );
 
             this.createLogin();
-            var mailButton = new ComplexButton( {value:interfaceTexts["data.upload.metadata.contact.mail"], parent:this.containerTools, id:"button_mail", onClick:jQuery.proxy( this.onClickMail, this )} );
+            var mailButton = new ComplexButton( {value:templateTexts["data.upload.metadata.contact.mail"], parent:this.containerTools, id:"button_mail", onClick:jQuery.proxy( this.onClickMail, this )} );
 
-            var valueLanguage = interfaceTexts["app.fr"];
+            var valueLanguage = templateTexts["app.fr"];
             if( this.isLanguageFr )
-                valueLanguage = interfaceTexts["app.en"];
+                valueLanguage = templateTexts["app.en"];
 
             var languageButton = new ComplexButton( {value:valueLanguage, parent:this.containerTools, id:"button_language", onClick:jQuery.proxy( this.onClickLanguage, this )} );
-            var homeButton = new ComplexButton( {value:interfaceTexts["app.home"], parent:this.containerTools, id:"button_home", onClick:this.onClickHome} );
+            var homeButton = new ComplexButton( {value:templateTexts["app.home"], parent:this.containerTools, id:"button_home", onClick:this.onClickHome} );
 
             var divSmallLogoEther = $( document.createElement( "div" ) );
@@ -54 +54 @@
                 var textLogin = this.jSONUser.name + " " + this.jSONUser.firstName;
                 if( this.jSONUser.role && this.jSONUser.role == "coordinateur" )
-                    textLogin += " (" + interfaceTexts["app.admin"] + ")";
+                    textLogin += " (" + templateTexts["app.admin"] + ")";
 
                 var loginButton = new ComplexButton( {value:textLogin, parent:this.containerTools, id:"button_login"} );
@@ -69 +69 @@
             else
             {
-                var loginButton = new ComplexButton( {value:interfaceTexts["app.connexion"], parent:this.containerTools, id:"button_login"} );
+                var loginButton = new ComplexButton( {value:templateTexts["app.connexion"], parent:this.containerTools, id:"button_login"} );
 
                 var loginMiddle = $( "#button_login #button_middle" );
@@ -76 +76 @@
                 var aLogin = $( document.createElement( "a" ) );
                 aLogin.attr( {href:"login", class:"signin"} );
-                aLogin.html( "<span>" + interfaceTexts["app.connexion"] + "</span>" );
+                aLogin.html( "<span>" + templateTexts["app.connexion"] + "</span>" );
                 loginMiddle.append( aLogin );
 

ether_megapoli/trunk/web/resources/templates/appleTemplate.jsp

@@ -25 +25 @@
     <ether:htmlJs jsFile="library/jquery.class"/>
     <ether:htmlJs jsFile="library/jquery.protify-0.3"/>
-    <ether:htmlJs jsFile="Request"/>
-    <ether:htmlJs jsFile="etherHelper"/>
+    <ether:htmlJs jsFile="classesForJQuery/etherHelper"/>
     <ether:htmlJs jsFile="classesForJQuery/ComplexButton"/>
     <ether:htmlJs jsFile="classesForJQuery/Slide"/>
@@ -145 +144 @@
                     <ul>
                         <li><html:link page="/visualization?methodName=viewParametersByPlateform"><span><bean:message key="data.visualization"/></span></html:link></li>
-                        <li><html:link page="/visualization/inWork.jsp"><span><bean:message key="simulation.visualization"/></span></html:link></li>
+                        <li><html:link page="/visualization?methodName=viewInWork"><span><bean:message key="simulation.visualization"/></span></html:link></li>
                     </ul>
                 </div>
@@ -180 +179 @@
 
 <script type="text/javascript">
-    var interfaceTexts = $A( "" );
-    interfaceTexts["app.home"] = '<bean:message key="app.home"/>';
-    interfaceTexts["app.fulltitle"] = '<bean:message key="app.fulltitle"/>';
-    interfaceTexts["app.en"] = '<bean:message key="app.en"/>';
-    interfaceTexts["app.fr"] = '<bean:message key="app.fr"/>';
-    interfaceTexts["app.connexion"] = '<bean:message key="app.connexion"/>';
-    interfaceTexts["data.upload.metadata.contact.mail"] = '<bean:message key="data.upload.metadata.contact.mail"/>';
-    interfaceTexts["app.admin"] = '<bean:message key="app.admin"/>';
+    var templateTexts = $A( "" );
+    templateTexts["app.home"] = '<bean:message key="app.home"/>';
+    templateTexts["app.fulltitle"] = '<bean:message key="app.fulltitle"/>';
+    templateTexts["app.en"] = '<bean:message key="app.en"/>';
+    templateTexts["app.fr"] = '<bean:message key="app.fr"/>';
+    templateTexts["app.connexion"] = '<bean:message key="app.connexion"/>';
+    templateTexts["data.upload.metadata.contact.mail"] = '<bean:message key="data.upload.metadata.contact.mail"/>';
+    templateTexts["app.admin"] = '<bean:message key="app.admin"/>';
 
     var interfaceTemplate = new InterfaceTemplate();

ether_megapoli/trunk/web/src/com/ether/Controller.java

@@ -44 +44 @@
     /** *********************************************************** **/
     /** *********************** VIEWS ***************************** **/
-    /**
-     * ********************************************************** *
-     */
+    /** *********************************************************** **/
     // Default view if methodName is unknown
     public ModelAndView home( final HttpServletRequest request, final HttpServletResponse response )
@@ -52 +50 @@
     {
         return new ModelAndView( "index" );
+    }
+
+    @ControllerMethod(view = VIEW_WORK)
+    public Map<String, Object> viewInWork()
+            throws ServiceException
+    {
+        return new HashMap<String, Object>();
     }
 
@@ -80 +85 @@
     /** *********************************************************** **/
     /** *********************** CALLS ***************************** **/
-    /**
-     * ********************************************************** *
-     */
+    /** *********************************************************** **/
     @ControllerMethod(jsonResult = true)
     public JSONObject searchParametersByPlateform( @Mandatory @ParamName(ParameterConstants.PARAMETER_ID) final Integer plateformId )
@@ -252 +255 @@
     private static final Log LOGGER = LogFactory.getLog( Controller.class );
 
+    private static final String VIEW_WORK = "visualization/inWork";
     private static final String VIEW_VISUALIZATION = "visualization/visu";
     private static final String VIEW_VISUALIZATION_PARAMETER_BY_PLATEFORM = "visualization/visu_parameter_by_pf";

ether_megapoli/trunk/web/visualization/inWork.jsp

@@ -1 @@
-<%@ page import="com.medias.Context" %>
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %>
@@ -5 +4 @@
 <%@ taglib prefix="ether" tagdir="/WEB-INF/tags" %>
 
-<tiles:insert page="/resources/templates/template.jsp" flush="true">
+<tiles:insert page="/resources/templates/appleTemplate.jsp" flush="true">
 
-        <tiles:put name="nav" value=''/>
+    <tiles:put name="insertCss" type="string"></tiles:put>
+    <tiles:put name="insertJsOrJsp" type="string"></tiles:put>
 
-    <tiles:put name="title" type="string">
-        <bean:message key="app.title"/> - <bean:message key="app.welcome"/>
-    </tiles:put>
+    <tiles:put name="title" type="string"><bean:message key="app.title"/> - <bean:message key="app.welcome"/></tiles:put>
+    <tiles:put name="nav" type="string"></tiles:put>
 
+
+    <%--****************** CONTENT ****************** --%>
     <tiles:put name="bodytitle" type="string">
         <bean:message key="inWork"/>

ether_megapoli/trunk/web/visualization/visu_parameter_by_pf-script.jsp

@@ -7 +7 @@
     {
         // Values
-        this.parent = $( "txt" );
-        this.superParent = $( "pageContent" ); // need to resize in function of containerParameters
-        this.generalContainerPlateforms = $( "generalContainerPlateforms" );
-        this.generalContainerParameters = $( "generalContainerParameters" );
-        this.generalContainerOptions = $( "generalContainerOptions" );
+        this.parent = $( "#txt" );
+        this.superParent = $( "#pageContent" ); // need to resize in function of containerParameters
+        this.generalContainerPlateforms = $( "#generalContainerPlateforms" );
+        this.generalContainerParameters = $( "#generalContainerParameters" );
+        this.generalContainerOptions = $( "#generalContainerOptions" );
         this.jsonPlateforms = jsonPlateforms || null;
         this.jsonAxeTypesForFixedPlateforms = axeTypesForFixedPlateforms || null;
@@ -24 +24 @@
 
         /** *********** CONTAINERS *********** **/
-        this.containerPlateforms = $( "containerPlateforms" );
-        this.containerParameters = $( "containerParameters" );
-        this.containerButtons = $( "containerButtons" );
-        this.containerOptionCalendar = $( "containerOptionCalendar" );
-        this.containerOptionType = $( "containerOptionType" );
-        this.containerOptionPlotsSelect = $( "containerOptionPlotsSelect" );
-        this.containerOptionPlotsButtons = $( "containerOptionPlotsButtons" );
+        this.containerPlateforms = $( "#containerPlateforms" );
+        this.containerParameters = $( "#containerParameters" );
+        this.containerButtons = $( "#containerButtons" );
+        this.containerOptionCalendar = $( "#containerOptionCalendar" );
+        this.containerOptionType = $( "#containerOptionType" );
+        this.containerOptionPlotsSelect = $( "#containerOptionPlotsSelect" );
+        this.containerOptionPlotsButtons = $( "#containerOptionPlotsButtons" );
 
         /** *********** LOADING *********** **/
@@ -48 +48 @@
 
         /** *********** WINDOW FOR THE PLOT *********** **/
-        this.plotWindow = new Window( {className: "dialog", zIndex: 100,
-            resizable: true, draggable:true, wiredDrag: true,
-            showEffect:Effect.BlindDown, hideEffect: Effect.SwitchOff } );
-        this.plotWindow.setTitle( interfaceTexts["app.title"] + "-" + interfaceTexts["data.visualization.quicklook"] );
+//        this.plotWindow = new Window( {className: "dialog", zIndex: 100,
+//            resizable: true, draggable:true, wiredDrag: true,
+//            showEffect:Effect.BlindDown, hideEffect: Effect.SwitchOff } );
+//        this.plotWindow.setTitle( interfaceTexts["app.title"] + "-" + interfaceTexts["data.visualization.quicklook"] );
 
         this.createOptions();
@@ -62 +62 @@
         // Calendar
         this.calendarFormat = "%Y-%m-%d %H:%i";
-        this.calendarConverter = new AnyTime.Converter( { format: this.calendarFormat } );
-
-        AnyTime.picker( "beginDate", { format: this.calendarFormat, firstDOW: 1,
-            labelTitle: interfaceTexts["data.visualization.selectDate"], labelYear: interfaceTexts["data.visualization.selectYear"], labelMonth: interfaceTexts["data.visualization.selectMonth"], labelDayOfMonth: interfaceTexts["data.visualization.selectDay"],
-            labelHour: interfaceTexts["data.visualization.selectHour"], labelMinute: interfaceTexts["data.visualization.selectMinute"],
-            methodToCall: this.onClickBeginDate.bindAsEventListener( this )
-        } );
-
-        AnyTime.picker( "endDate", { format: this.calendarFormat, firstDOW: 1,
-            labelTitle: interfaceTexts["data.visualization.selectDate"], labelYear: interfaceTexts["data.visualization.selectYear"], labelMonth: interfaceTexts["data.visualization.selectMonth"], labelDayOfMonth: interfaceTexts["data.visualization.selectDay"],
-            labelHour: interfaceTexts["data.visualization.selectHour"], labelMinute: interfaceTexts["data.visualization.selectMinute"],
-            methodToCall: this.onClickEndDate.bindAsEventListener( this ),
-            idToUpdateEarliest: "beginDate"
-        } );
-
-        $( "beginDate" ).value = this.firstDate;
-        $( "endDate" ).value = this.lastDate;
-        this.clearCalendarButton = new Button( {value:interfaceTexts["data.visualization.button.clear"], parent:this.containerOptionCalendar, id:"button_clear_calendar", className:"small", onClick:this.onClickClear.bind( this )} );
+//        this.calendarConverter = new AnyTime.Converter( { format: this.calendarFormat } );
+
+//        AnyTime.picker( "beginDate", { format: this.calendarFormat, firstDOW: 1,
+//            labelTitle: interfaceTexts["data.visualization.selectDate"], labelYear: interfaceTexts["data.visualization.selectYear"], labelMonth: interfaceTexts["data.visualization.selectMonth"], labelDayOfMonth: interfaceTexts["data.visualization.selectDay"],
+//            labelHour: interfaceTexts["data.visualization.selectHour"], labelMinute: interfaceTexts["data.visualization.selectMinute"],
+//            methodToCall: this.onClickBeginDate.bindAsEventListener( this )
+//        } );
+//
+//        AnyTime.picker( "endDate", { format: this.calendarFormat, firstDOW: 1,
+//            labelTitle: interfaceTexts["data.visualization.selectDate"], labelYear: interfaceTexts["data.visualization.selectYear"], labelMonth: interfaceTexts["data.visualization.selectMonth"], labelDayOfMonth: interfaceTexts["data.visualization.selectDay"],
+//            labelHour: interfaceTexts["data.visualization.selectHour"], labelMinute: interfaceTexts["data.visualization.selectMinute"],
+//            methodToCall: this.onClickEndDate.bindAsEventListener( this ),
+//            idToUpdateEarliest: "beginDate"
+//        } );
+//
+//        $( "beginDate" ).value = this.firstDate;
+//        $( "endDate" ).value = this.lastDate;
+        this.clearCalendarButton = new Button( {value:interfaceTexts["data.visualization.button.clear"], parent:this.containerOptionCalendar, id:"button_clear_calendar", className:"small", onClick:jQuery.proxy( this.onClickClear, this )} );
 
         // Buttons and axe's types
@@ -89 +89 @@
     createButtons: function()
     {
-        this.visualizeButton = new Button( {value:interfaceTexts["data.visualization.button.visualize"], parent:this.containerButtons, id:"button_visualize", onClick:this.onClickVisualize.bind( this )} );
+        this.visualizeButton = new Button( {value:interfaceTexts["data.visualization.button.visualize"], parent:this.containerButtons, id:"button_visualize", onClick:jQuery.proxy( this.onClickVisualize, this )} );
         this.visualizeButton.disable();
-        this.downloadButton = new Button( {value:interfaceTexts["data.visualization.button.download"], parent:this.containerButtons, id:"button_download", onClick:this.onClickDownload.bind( this )} );
+        this.downloadButton = new Button( {value:interfaceTexts["data.visualization.button.download"], parent:this.containerButtons, id:"button_download", onClick:jQuery.proxy( this.onClickDownload, this )} );
         this.downloadButton.disable();
     },
@@ -110 +110 @@
         paramSelect.classNameOption = "select_plot_option";
         this.selectPlots = new Select( paramSelect );
-        this.selectParameters = $A();
+        this.selectParameters = $();
         this.selectPlots.add( null, interfaceTexts["data.visualization.graph.noPlot"] );
         this.selectPlots.selectFirst( false );
@@ -116 +116 @@
         this.selectPlotsPlateformType = false;
 
-        this.addPlotButton = new Button( {value:interfaceTexts["data.visualization.add"], parent:this.containerOptionPlotsButtons, id:"button_add_plot", className:"small", onClick:this.onClickAddPlot.bind( this )} );
+        this.addPlotButton = new Button( {value:interfaceTexts["data.visualization.add"], parent:this.containerOptionPlotsButtons, id:"button_add_plot", className:"small", onClick:jQuery.proxy( this.onClickAddPlot, this )} );
         this.addPlotButton.disable();
-        this.initPlotButton = new Button( {value:interfaceTexts["data.visualization.button.init"], parent:this.containerOptionPlotsButtons, id:"button_init_plot", className:"small", onClick:this.onClickInitPlot.bind( this )} );
+        this.initPlotButton = new Button( {value:interfaceTexts["data.visualization.button.init"], parent:this.containerOptionPlotsButtons, id:"button_init_plot", className:"small", onClick:jQuery.proxy( this.onClickInitPlot, this )} );
     },
 
@@ -125 +125 @@
     {
         if( this.selectedPlateform )
-            new Ajax.Request( "visualization?methodName=searchParametersByPlateform&id=" + this.selectedPlateform.getId(),
-            {
-                onSuccess:this.handleParametersBySelectedPlateform.bind( this )
+            $.ajax( {
+                url: "visualization?methodName=searchParametersByPlateform&id=" + this.selectedPlateform.getId(),
+                success:jQuery.proxy( this.handleParametersBySelectedPlateform, this )
             } );
     },
@@ -143 +143 @@
     handleParametersBySelectedPlateform: function( result )
     {
-        this.jsonParameters = result.responseText.evalJSON().parameters;
+        this.jsonParameters = jQuery.parseJSON( result ).parameters;
         this.displayParameters();
     },
@@ -171 +171 @@
         this.plateforms = new ListPlatforms( this.jsonPlateforms, new Object() );
 
-        this.plateforms.addOpenListener( this.onSelectPlateform.bind( this ) );
+        this.plateforms.addOpenListener( jQuery.proxy( this.onSelectPlateform, this ) );
         this.loadingPlateforms.hide();
         this.plateforms.displayWithPairImpair( this.containerPlateforms, "NoPlateform", interfaceTexts["data.visualization.noPlateform"] );
@@ -187 +187 @@
     {
         var objectParameter = new Object();
-        objectParameter.onMouseOverContainer = this.onMouseOverParameter;
-        objectParameter.onMouseOutContainer = this.onMouseOutParameter;
         this.parameters = new ListParameters( this.jsonParameters, objectParameter );
 
-        this.parameters.addOpenListener( this.onSelectParameter.bind( this ) );
+        this.parameters.addOpenListener( jQuery.proxy( this.onSelectParameter, this ) );
         this.loadingParameters.hide();
         this.parameters.displayWithPairImpair( this.containerParameters, "NoParameter", interfaceTexts["data.visualization.noParameter"] );
-
-        this.resizeContainers();
     },
 
@@ -220 +216 @@
         this.addPlotButton.disable();
 
-        $( "textareaTitle" ).value = this.selectedPlateform.getName();
+        $( "#textareaTitle" ).html( this.selectedPlateform.getName() );
 
         // Init number and list of parameter to display
@@ -246 +242 @@
 
         // Change title
-        $( "textareaTitle" ).value = this.selectedPlateform.getName() + " - " + this.selectedParameter.getName();
+        $( "textareaTitle" ).html( this.selectedPlateform.getName() + " - " + this.selectedParameter.getName() );
 
         // Update number and list of parameter to display
@@ -258 +254 @@
 
         this.testAllFields();
-    },
-
-    onMouseOverParameter: function()
-    {
-        this.divContainer.innerHTML = this.jsonElement.name + " (" + this.jsonElement.code + ")";
-    },
-
-    onMouseOutParameter: function()
-    {
-        this.divContainer.innerHTML = this.jsonElement.name;
     },
 
@@ -346 +332 @@
 
     // OTHERS ********************************************************
-    resizeContainers: function()
-    {
-        var titleSize = document.getElementById( "nav" ).offsetHeight + document.getElementById( "title" ).offsetHeight + 30;
-        var parentHeight = this.superParent.offsetHeight - titleSize;
-        var containerPlateformsHeight = this.generalContainerParameters.offsetHeight;
-        var containerParametersHeight = this.generalContainerParameters.offsetHeight;
-
-        var containerPlateforms = this.containerPlateforms.offsetHeight;
-        var containerParameters = this.containerParameters.offsetHeight;
-        var containerOptionsHeight = this.generalContainerOptions.offsetHeight;
-
-        var maxHeight = Math.max( containerPlateforms, containerParameters, containerOptionsHeight );
-
-        this.superParent.style.height = maxHeight + titleSize + 35 + "px";
-        this.generalContainerPlateforms.style.height = maxHeight + 20 + "px";
-        this.generalContainerParameters.style.height = maxHeight + 20 + "px";
-    },
-
     testAllFields: function()
     {
@@ -387 +355 @@
             jsonAxeTypes = this.jsonAxeTypesForFixedPlateforms;
 
-        jsonAxeTypes.each( function ( axeType )
+        jQuery.each( jsonAxeTypes, jQuery.proxy( function ( i, axeType )
         {
             this.selectAxes.add( axeType.value, interfaceTexts[axeType.text] );
-        }.bind( this ) );
+        }, this ) );
 
         this.selectAxes.selectFirst( false );
@@ -407 +375 @@
                 // INIT
                 this.selectPlots.clear();
-                this.selectParameters.clear();
+                this.selectParameters.empty();
                 this.selectPlotsPlateformType = false;
 
@@ -415 +383 @@
 
                     this.numberParameterToDisplay = 1;
-                    $( "messages_number_parameters" ).innerHTML = this.numberParameterToDisplay + " " + interfaceTexts["data.visualization.parameter"];
+                    $( "#messages_number_parameters" ).html( this.numberParameterToDisplay + " " + interfaceTexts["data.visualization.parameter"] );
                 }
                 else
@@ -423 +391 @@
 
                     this.numberParameterToDisplay = 0;
-                    $( "messages_number_parameters" ).innerHTML = "";
+                    $( "#messages_number_parameters" ).html( "" );
                 }
                 break;
@@ -432 +400 @@
                 {
                     this.selectPlots.clear();
-                    this.selectParameters.clear();
+                    this.selectParameters.empty();
                     this.numberParameterToDisplay = 1;
                 }
 
                 this.selectPlots.changeSelectMiddle( this.selectedPlateform.getId() + "-" + this.selectedParameter.getId(), this.selectedPlateform.getName() + " - " + this.selectedParameter.getName() );
-                $( "messages_number_parameters" ).innerHTML = this.numberParameterToDisplay + " " + interfaceTexts["data.visualization.parameter"];
+                $( "#messages_number_parameters" ).html( this.numberParameterToDisplay + " " + interfaceTexts["data.visualization.parameter"] );
                 break;
 
@@ -449 +417 @@
                     this.selectPlots.select( plotValue, false );
                     this.selectPlotsPlateformType = this.selectedPlateform.jsonElement.type;
-                    if( !isParameterAlreadySelected )
-                        this.selectParameters[this.selectParameters.size()] = this.selectedParameter.getId();
+//                    if( !isParameterAlreadySelected )
+                        this.selectParameters.push( this.selectedParameter.getId() );
 
                     this.numberParameterToDisplay = this.selectPlots.getSize();
                 }
 
-                $( "messages_number_parameters" ).innerHTML = this.numberParameterToDisplay + " " + interfaceTexts["data.visualization.parameter"];
+                $( "#messages_number_parameters" ).html( this.numberParameterToDisplay + " " + interfaceTexts["data.visualization.parameter"] );
                 break;
         }

ether_megapoli/trunk/web/visualization/visu_parameter_by_pf.jsp

@@ -1 +1 @@
 <%@ page import="com.ether.AxeTypeForFixedPlateform" %>
 <%@ page import="com.ether.AxeTypeForMobilePlateform" %>
-<%@ page import="com.medias.Context" %>
-
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %>
 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %>
@@ -9 +7 @@
 <%@ taglib prefix="ether" tagdir="/WEB-INF/tags" %>
 
-<tiles:insert page="/resources/templates/templateEther.jsp" flush="true">
-
-    <tiles:put name="title" type="string">
-        <bean:message key="app.title"/> - <bean:message key="app.welcome"/>
-    </tiles:put>
+<tiles:insert page="/resources/templates/appleTemplate.jsp" flush="true">
 
     <tiles:put name="insertCss" type="string">
-        <ether:htmlCss cssFile="ether"/>
         <ether:htmlCss cssFile="button"/>
         <ether:htmlCss cssFile="blueprint-css/blueprint/src/grid"/>
-
         <ether:htmlCss cssFile="visu_parameter_by_pf"/>
         <ether:htmlCss cssFile="select"/>
-
         <%-- Calendar --%>
         <ether:htmlCss cssFile="calendar/anytime"/>
         <ether:htmlCss cssFile="windows_js_1.3/themes/default"/>
         <ether:htmlCss cssFile="windows_js_1.3/themes/mac_os_x"/>
-
     </tiles:put>
 
     <tiles:put name="insertJsOrJsp" type="string">
-        <ether:htmlResourceJsp jspFile="etherHead"/>
-        <ether:htmlJs jsFile="etherClasses"/>
+        <ether:htmlJs jsFile="classesForJQuery/etherClasses"/>
         <ether:htmlJsp jspFile="visu_parameter_by_pf-script"/>
         <ether:htmlJsp jspFile="visu_parameter_by_pf-classes"/>
-        <ether:htmlJs jsFile="Button"/>
-        <ether:htmlJs jsFile="Select"/>
-        <ether:htmlJs jsFile="Loading"/>
-
-        <ether:htmlJs jsFile="library/jquery-1.4.2.min"/>
-        <ether:htmlJs jsFile="library/prototype"/>
-
+        <ether:htmlJs jsFile="classesForJQuery/Button"/>
+        <ether:htmlJs jsFile="classesForJQuery/Select"/>
+        <ether:htmlJs jsFile="classesForJQuery/Loading"/>
         <%-- Calendar --%>
-        <ether:htmlJs jsFile="calendar/anytime"/>
-        <ether:htmlJs jsFile="windows_js_1.3/javascripts/debug"/>
-        <ether:htmlJs jsFile="windows_js_1.3/javascripts/effects"/>
-        <ether:htmlJs jsFile="windows_js_1.3/javascripts/window"/>
-        <ether:htmlJs jsFile="windows_js_1.3/javascripts/window_ext"/>
-
+        <%--<ether:htmlJs jsFile="calendar/anytime"/>--%>
+        <%--<ether:htmlJs jsFile="windows_js_1.3/javascripts/debug"/>--%>
+        <%--<ether:htmlJs jsFile="windows_js_1.3/javascripts/effects"/>--%>
+        <%--<ether:htmlJs jsFile="windows_js_1.3/javascripts/window"/>--%>
+        <%--<ether:htmlJs jsFile="windows_js_1.3/javascripts/window_ext"/>--%>
     </tiles:put>
 
-    <bean:define type="java.lang.String" id="relativePath" value="<%=Context.getRelativePath(request)%>"/>
-    <tiles:put name="nav" value='<%=relativePath+"/nav_visu_parameter.jsp"%>'/>
-
-
-    <tiles:put name="bodytitle" type="string">
-        <bean:message key="data.visualization.title"/>
+    <tiles:put name="title" type="string"><bean:message key="app.title"/> - <bean:message key="data.visualization.title"/></tiles:put>
+    <tiles:put name="nav" type="string">
+        <html:link page="/index.jsp"><bean:message key="app.home"/></html:link>&nbsp;&gt;
+        <html:link page="/visualization?methodName=view"><bean:message key="all.visualization"/></html:link>&nbsp;&gt;
+        <html:link page="/visualization?methodName=viewParametersByPlateform"><bean:message key="data.visualization"/></html:link>
     </tiles:put>
 
 
+    <%--****************** CONTENT ****************** --%>
+    <tiles:put name="bodytitle" type="string"><bean:message key="data.visualization.title"/></tiles:put>
+
     <tiles:put name="body" type="string">
 
-        <div class="span-25">
-            <div id="generalContainerPlateforms" class="span-6 colborder">
+            <div id="generalContainerPlateforms" class="span-5 colborder">
                 <div id="messages"><bean:message key="data.visualization.selectPf"/></div>
 
@@ -69 +54 @@
             </div>
 
-            <div id="generalContainerParameters" class="span-7 colborder">
+            <div id="generalContainerParameters" class="span-6 colborder">
                 <div id="messages"><bean:message key="data.visualization.selectParameter"/></div>
 
@@ -104 +89 @@
                 </div>
             </div>
-        </div>
 
         <script type="text/javascript">
-            var interfaceTexts = $A();
+            var interfaceTexts = $A( "" );
             interfaceTexts["app.title"] = '<bean:message key="app.title"/>';
             interfaceTexts["data.visualization.noPlateform"] = '<bean:message key="data.visualization.noPf"/>';
@@ -150 +134 @@
 
     </tiles:put>
-
 </tiles:insert>
-
-<!-- /*** ****************** FIN VISU ******************** **/ -->