Changeset 238

Timestamp:

11/07/11 18:22:12 (13 years ago)

Author:

vmipsl

Message:

jQuery

• calendrier ok
• window ok

Location:

ether_megapoli/trunk/web

Files:

• resources/css/button.css (modified) (1 diff)
• resources/css/etherApple.css (modified) (1 diff)
• resources/css/visu_parameter_by_pf.css (modified) (3 diffs)
• resources/js/classesForJQuery/ComplexButton.js (modified) (1 diff)
• resources/templates/appleTemplate.jsp (modified) (1 diff)
• visualization/visu_parameter_by_pf-script.jsp (modified) (9 diffs)

ether_megapoli/trunk/web/resources/css/button.css

@@ -6 +6 @@
 
 button {
+    -moz-border-radius: 4px 4px 4px 4px;
+    -webkit-border-radius: 4px 4px 4px 4px;
+
     display:block;
     float:left;

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

@@ -29 +29 @@
     text-decoration: none;
     color: #618EAC;
+}
+
+input {
+    -moz-border-radius: 4px 4px 4px 4px;
+    -webkit-border-radius: 4px 4px 4px 4px;
 }
 

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

@@ -13 +13 @@
 
 .containerPlateform:hover, .containerParameter:hover {
+    -moz-border-radius: 4px 4px 4px 4px;
+    -webkit-border-radius: 4px 4px 4px 4px;
     text-decoration: none;
     background: #70739C;
@@ -59 +61 @@
 .plateform_selected, .plateform_selected:hover,
 .parameter_selected, .parameter_selected:hover {
+    -moz-border-radius: 4px 4px 4px 4px;
+    -webkit-border-radius: 4px 4px 4px 4px;
     background: #70739C;
     color: #E1DEF1;
@@ -97 +101 @@
 
 .imageExamples {
-    margin : 10px;
+    margin: 10px;
 }
 
 .textExamples {
-    /*color: #04155D;*/
+/*color: #04155D;*/
     margin-bottom: 10px;
 }

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

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

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

@@ -22 +22 @@
     <ether:htmlCss cssFile="megapoliApple"/>
 
-    <ether:htmlJs jsFile="library/jquery-1.6.2.min"/>
+    <ether:htmlJs jsFile="library/jquery-1.4.2.min"/>
     <ether:htmlJs jsFile="library/jquery.class"/>
     <ether:htmlJs jsFile="library/jquery.protify-0.3"/>

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

@@ +1 @@
+<%@ page import="com.ether.EtherPlotServiceImpl" %>
 <script type="text/javascript">
 var InterfaceVisualization = Class.create( {
@@ -45 +46 @@
         this.loadingParameters.display();
 
-        /** *********** 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.createOptions();
         this.displayPlateforms();
@@ -88 +83 @@
     {
         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.visualizeButton.disable();
         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();
@@ -184 +179 @@
     displayParameters: function()
     {
-        var objectParameter = new Object();
-        this.parameters = new ListParameters( this.jsonParameters, objectParameter );
+        this.parameters = new ListParameters( this.jsonParameters,  new Object() );
 
         this.parameters.addOpenListener( jQuery.proxy( this.onSelectParameter, this ) );
@@ -240 +234 @@
 
         // Change title
-        $( "textareaTitle" ).html( this.selectedPlateform.getName() + " - " + this.selectedParameter.getName() );
+        $( "#textareaTitle" ).html( this.selectedPlateform.getName() + " - " + this.selectedParameter.getName() );
 
         // Update number and list of parameter to display
@@ -306 +300 @@
                     .dialog( {
                                  autoOpen: false,
-                                 title: interfaceTexts["app.title"] + "-" + interfaceTexts["data.visualization.quicklook"]
+                                 title: interfaceTexts["app.title"] + "-" + interfaceTexts["data.visualization.quicklook"],
+                                 minHeight: <%=EtherPlotServiceImpl.getMaxHeight()%>,
+                                 minWidth: <%=EtherPlotServiceImpl.getMaxWidth()%> + 28
                              } );
         }
@@ -315 +311 @@
                     .dialog( {
                                  autoOpen: false,
-                                 title: interfaceTexts["app.title"] + "-" + interfaceTexts["data.visualization.quicklook"]
+                                 title: interfaceTexts["app.title"] + "-" + interfaceTexts["data.visualization.quicklook"],
+                                 height: 50,
+                                 width: 400
                              } );
-//            this.plotWindow.setSize( 400, 50 );
         }
 
         $dialog.dialog( 'open' );
-//                prevent the default action, e.g., following a link
         return false;
     },
@@ -344 +340 @@
         if( (!this.selectedPlateform || !this.selectedParameter) && 0 == this.numberParameterToDisplay )
         {
-//            this.visualizeButton.disable();
+            this.visualizeButton.disable();
             this.downloadButton.disable();
             return;
@@ -459 +455 @@
         result.parameters = "dateBegin=" + this.beginDate
                 + "&dateEnd=" + this.endDate
-                + "&title=" + encodeURIComponent( $( "textareaTitle" ).value )
+                + "&title=" + encodeURIComponent( $( "#textareaTitle" ).val() )
                 + "&pfIdPIdList=" + arrayPIdPId
                 + "&axeType=" + this.selectAxes.getValue();