Changeset 754

Timestamp:

01/30/13 19:48:01 (11 years ago)

Author:

cbipsl

Message:

Mise à jour interface quicklook

Location:

ether_iasi/trunk/web

Files:

• project/quicklook.jsp (modified) (3 diffs)
• project/quicklook_script.jsp (modified) (1 diff)
• resources/css/button.css (modified) (1 diff)
• resources/css/iasi.css (modified) (2 diffs)
• src/com/ether/Controller.java (modified) (2 diffs)

ether_iasi/trunk/web/project/quicklook.jsp

@@ -51 +51 @@
 
     <div id="containerQuickLookA" class="containerQuickLooks">
-        <div id="containerResultA"></div>
+        <div id="containerResultA" class="containerResult" ></div>
 
     </div>
@@ -57 +57 @@
 
     <div id="containerQuickLookB" class="containerQuickLooks">
-        <div id="containerResultB"></div>
+        <div id="containerResultB" class="containerResult"></div>
     </div>
 
@@ -67 +67 @@
         new InterfaceIasi();
     </script>
+</div>
 
 </BODY>

ether_iasi/trunk/web/project/quicklook_script.jsp

@@ -124 +124 @@
             var plotNameC = jQuery.parseJSON( result ).plotNameResultC;
             var plotNameD = jQuery.parseJSON( result ).plotNameResultD;
+            var repDate =  jQuery.parseJSON( result ).plotRepResult;
 
 
             if( plotNameA && plotNameB )
             {
-                this.containerResultA.html( "<center>MetOp-A</center><center><img src='resources/imgiasiA/" + plotNameA + "' width='430px' height='350px' onerror='javascript:displayNoImage()'><img src='resources/img/" + plotNameC + "' width='430px' height='350px'></center>" );
-                this.containerResultB.html( "<center>MetOp-B</center><center><img src='resources/imgiasiB/" + plotNameB + "' width='430px' height='350px' onerror='javascript:displayNoImageB()'><img src='resources/img/" + plotNameD + "' width='430px' height='350px'></center>" );
+                this.containerResultA.html( "<center>MetOp-A</center><img src='resources/imgiasiA/" + repDate + "/" + plotNameA + "' width='430px' height='350px' onerror='javascript:displayNoImage()'><img src='resources/imgiasiA/" + repDate + "/"  + plotNameC + "' width='430px' height='350px'>" );
+                this.containerResultB.html( "<center>MetOp-B</center><img src='resources/imgiasiB/" + repDate + "/" + plotNameB + "' width='430px' height='350px' onerror='javascript:displayNoImageB()'><img src='resources/imgiasiB/" + repDate + "/" + plotNameD + "' width='430px' height='350px'>" );
             }
             else
             {
                 if( plotNameA )
-                    this.containerResultA.html( "<center>MetOp-A</center><center><img src='resources/imgiasiA/" + plotNameA + "' width='430px' height='350px' onerror='javascript:displayNoImage()'><img src='resources/img/" + plotNameC + "' width='430px' height='350px'></center>" );
+                    this.containerResultA.html( "<center>MetOp-A</center><img src='resources/imgiasiA/" + repDate + "/" + plotNameA + "' width='430px' height='350px' onerror='javascript:displayNoImage()'><img src='resources/imgiasiA/" + repDate + "/" + plotNameC + "' width='430px' height='350px'>" );
 
                 if( plotNameB )
-                    this.containerResultA.html( "<center>MetOp-B</center><center><img src='resources/imgiasiB/" + plotNameB + "' width='430px' height='350px' onerror='javascript:displayNoImage()'><img src='resources/img/" + plotNameD + "' width='430px' height='350px'></center>" );
+                    this.containerResultA.html( "<center>MetOp-B</center><img src='resources/imgiasiB/" + repDate + "/" + plotNameB + "' width='430px' height='350px' onerror='javascript:displayNoImage()'><img src='resources/imgiasiB/" + repDate + "/" + plotNameD + "' width='430px' height='350px'>" );
 
             }

ether_iasi/trunk/web/resources/css/button.css

@@ -51 +51 @@
     width: 16px;
     height: 16px;
-}                                                      s
+}
 
 /* STANDARD */

ether_iasi/trunk/web/resources/css/iasi.css

@@ -45 +45 @@
 .containerQuickLooks {
     float: left;
-    margin: 40px 0;
-    width: 900px;
+    margin: 30px 0;
+    width: 950px;
     text-align: center;
     color: #000099;
@@ -53 +53 @@
     font-weight: bold;
 }
+.containerResult {
+    margin: 0 20px;
+
+}
+
 
 .containerDataAccess {

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

@@ -72 +72 @@
         final Date date = calendar.getTime();
         final String fmtDate = DateHelper.formatDate( date, "yyyyMMdd" );
+        final String repDate = DateHelper.formatDate( date, "yyyy/MM/dd" );
         String plotNameA = "";
         String plotNameB = "";
@@ -91 +92 @@
         result.put( "plotNameResultC", plotNameC );
         result.put( "plotNameResultD", plotNameD );
+        result.put( "plotRepResult", repDate);
         return result;