Changeset 763

Timestamp:

03/22/13 11:28:39 (11 years ago)

Author:

npipsl

Message:

Correction bug réinitialisation de menus déroulants
changement couleurs et ombres boutons et onglets

Location:

geisa/web

Files:

• initGeisa_script.jsp (modified) (1 diff)
• resources/css/button.css (modified) (1 diff)
• resources/css/geisa.css (modified) (2 diffs)
• resources/templates/templateGeisa.jsp (modified) (2 diffs)
• src/com/ether/Controller.java (modified) (1 diff)

geisa/web/initGeisa_script.jsp

@@ -2500 +2500 @@
                     this.selectTraceAxeY1.remove( 'Z', "Number of lines ", jQuery.proxy(this.onClickSelectTraceAxeY1, this ) );
                     this.selectTraceAxeY2.remove( 'Z', "Number of lines ", jQuery.proxy(this.onClickSelectTraceAxeY2, this ) );
-                    //Selection par defaut du 1er element (pour que  "Number of lines"  ne soit plus selectionne par defaut si il n'existe plus)
-                    this.selectTraceAxeY1.selectFirst();
-                    this.selectTraceAxeY2.selectFirst();
+                    //Si "number of line" est selectionné alors qu'il n'existe plus (car mean value est maintenant 0), alors on recharge le menu deroulant pour qu'il se mette sur "intensity".
+                    if  (this.selectTraceAxeY1.getValue() == 'Z' )
+                    {
+                     this.selectTraceAxeY1.selectFirst();
+                    }
+                    if  (this.selectTraceAxeY2.getValue() == 'Z' )
+                    {
+                     this.selectTraceAxeY1.selectFirst();
+                    }
+                   // this.selectTraceAxeY1.selectFirst();
+                    //this.selectTraceAxeY2.selectFirst();
                                      }
                 //dans l'option "databases comparison" griser ou non la zone outputChoice en fonction de la valeur de   "Bin-average"

geisa/web/resources/css/button.css

@@ -29 +29 @@
     overflow: visible;
     padding: 4px 6px 3px 6px; /* IE6 */
+
+    -moz-box-shadow: 2px 3px 7px rgba(0, 0, 0, 0.3);
+    -webkit-box-shadow: 2px 3px 7px rgba(0, 0, 0, 0.3);
+    box-shadow: 2px 3px 7px rgba(0, 0, 0, 0.3);
 }
 

geisa/web/resources/css/geisa.css

@@ -525 +525 @@
 
 .tab_class {
-    -moz-border-radius: 4px 4px 0 0;
+   /* -moz-border-radius: 4px 4px 0 0; */
     -moz-box-shadow: 2px 3px 7px rgba(0, 0, 0, 0.3);
-    background: none repeat scroll 0 0 #a0c3df;
+    -moz-border-radius: 4px 4px 4px 4px;
+    -webkit-border-radius: 4px 4px 4px 4px;
+    -webkit-box-shadow: 2px 3px 7px rgba(0, 0, 0, 0.3);
+    box-shadow: 2px 3px 7px rgba(0, 0, 0, 0.3);
+    border-radius: 4px 4px 4px 4px;
+    background: none repeat scroll 0 0 #FFCC33;
+    /*background: none repeat scroll 0 0 #a0c3df;*/
     color: black;
     float: right;
@@ -538 +544 @@
 
 
-
 .tab_class.activated {
-    background: none repeat scroll 0 0 #6191b5;
-    color: white;
+    /*background: none repeat scroll 0 0 #6191b5;*/
+    background: none repeat scroll 0 0 #FF9300;
+    /*color: white;*/
+    color:#0C0CEF;
 }
 
 .tab_class:hover {
-  background: none repeat scroll 0 0 #4382C1;
-}
+ /* background: none repeat scroll 0 0 #4382C1;*/
+ background: none repeat scroll 0 0 #FF9300;
+}

geisa/web/resources/templates/templateGeisa.jsp

@@ -64 +64 @@
     <%-- ****************** MENU ****************** --%>
        <div id="containerCenter" class="containerTapas containerCenter">
-         <%--    <div id="menu" class="containerMenu">
+           <%-- <div id="menu" class="containerMenu">
                 <ul class="menu">
                     <li><a href="#" class="parent"><span>Graphics options</span></a>
@@ -118 +118 @@
 
                 </ul>
-            </div> --%>
+            </div>  --%>
 
 

geisa/web/src/com/ether/Controller.java

@@ -283 +283 @@
 
     //local
-     public static final String PATH_PROCESS = "/home/npipsl/Desktop/geisa-Graphique/prog-ether/";
+      public static final String PATH_PROCESS = "/home/npipsl/Desktop/geisa-Graphique/prog-ether/";
     //naboo
-   // public static final String PATH_PROCESS = "/home/www/GEISA/";
+  // public static final String PATH_PROCESS = "/home/www/GEISA/";
     private static final String VIEW_INIT = "init";
     private static final String VIEW_INIT2 = "initGeisa";