Changeset 230

Timestamp:

10/24/11 12:33:31 (13 years ago)

Author:

vmipsl

Message:

look apple

Location:

ether_megapoli/trunk

Files:

• common/Common.iml (modified) (1 diff)
• web/resources/css/megapoliApple.css (modified) (7 diffs)
• web/resources/jsp/apple_etherHead.jsp (modified) (5 diffs)
• web/resources/templates/appleTemplate.jsp (modified) (4 diffs)

ether_megapoli/trunk/common/Common.iml

@@ -10 +10 @@
       <sourceFolder url="file://$MODULE_DIR$/interface" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="lib_ether" level="project" />

ether_megapoli/trunk/web/resources/css/megapoliApple.css

@@ -39 +39 @@
 /** ********************** CONTAINER ******************** **/
 /** ***************************************************** **/
+.containerLinkLogoEther {
+    position: absolute;
+    top: 0;
+    left: 127px;
+    width: 10px;
+    height: 99px;
+    background-image: url("../images/link_logo_Ether.png");
+    background-repeat: repeat-y;
+}
+
+.containerLogoEther {
+    position: absolute;
+    top: 100px;
+    left: 50px;
+    -moz-border-radius: 4px 4px 4px 4px;
+    -moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.3);
+    -webkit-border-radius: 4px 4px 4px 4px;
+    -webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.3);
+    width: 80px;
+    height: 80px;
+    padding: 15px;
+}
+
 .containerMegapoli {
     -moz-border-radius: 4px 4px 4px 4px;
     -moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.3);
+    -webkit-border-radius: 4px 4px 4px 4px;
+    -webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.3);
     width: 980px;
     float: left;
@@ -59 +84 @@
 .containerLogo {
     -moz-border-radius: 4px 4px 4px 4px; /*-moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3);*/
+    -webkit-border-radius: 4px 4px 4px 4px;
     float: left;
     margin-bottom: 10px;
@@ -82 +108 @@
     -moz-border-radius: 4px 4px 4px 4px;
     -moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.3);
-    float: left;
-    position: relative;
-    width: 340px;
+    -webkit-border-radius: 4px 4px 4px 4px;
+    -webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.3);
+    float: left;
+    position: relative;
+    width: 334px;
     height: 31px;
     color: #04155D;
     top: 4px;
-    margin-bottom: 20px;
-    margin-right: 15px;
+    margin-bottom: 20px; /*margin-right: 15px;*/
     padding-top: 6px;
     padding-left: 10px;
+    font-size: 11px;
 }
 
@@ -111 +139 @@
     -moz-border-radius: 4px 4px 0 0;
     -moz-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+    -webkit-border-radius: 4px 4px 0 0;
+    -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
     background-image: url("../images/fond_bleu2.png");
     background-repeat: repeat-x;
@@ -125 +155 @@
 .containerCenter {
     -moz-border-radius-topright: 0;
+    -webkit-border-radius: 0; /*#E8EFF3*//* #618EAC*/
+    background: -moz-linear-gradient(white, #E8EFF3);
     min-height: 400px;
     text-align: justify;
@@ -149 +181 @@
 }
 
-.containerButtonSlideLeft {
+/** ***************************************************** **/
+/** ************************ SLIDES ********************** **/
+/** ***************************************************** **/
+.containerLeftSlides {
     position: absolute;
-    top: 10px;
-}
-
-.containerSlideLeft {
-    position: absolute;
-    top: 50px;
-}
+    top: 300px;
+}
+
+#slideCredits, #slideMentions, #slideInfos {
+    -moz-border-radius: 4px 4px 0 0;
+    -moz-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+    -webkit-border-radius: 4px 4px 0 0;
+    -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+}
+
+.containerSlideContent {
+    float: left;
+    min-height: 200px;
+    -moz-border-radius: 4px 4px 0 0;
+    -moz-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+    -webkit-border-radius: 4px 4px 0 0;
+    -webkit-box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
+    padding: 10px;
+    display: none;
+}
+
+.containerSlides {
+    float: left;
+    position: relative;
+    top: 20px;
+    margin-left: 1px;
+}
+
+#buttonSlideCredits {
+    background-image: url("../icons/man_credits.gif");
+    width: 10px;
+    height: 10px;
+}
+
+/*#buttonSlideMentions {*/
+/*background-image: url("../images/elements/button_middle_3.png");*/
+/*}*/
+
+/*#buttonSlideHelp {*/
+/*background-image: url("../images/elements/button_middle_3.png");*/
+/*}*/
 
 /** ***************************************************** **/
@@ -178 +247 @@
 .roundTable {
     -moz-border-radius: 4px;
+    -webkit-border-radius: 4px;
 }
 

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

@@ -9 +9 @@
             this.containerTitle = $( "#title" );
             this.containerTools = $( "#tools" );
+            this.containerSlides = $( "#slides" );
+            this.containerSlide = $( "#slideContent" );
 
             /** *********** VARIABLES *********** **/
@@ -16 +18 @@
             this.relativePageUri = "<%=Context.getRelativePath( request )%>?<%=request.getQueryString()%>";
             this.jSONUser = <%=Context.getUser( request )%> ? <%=Context.getUser( request )%> : false;
+            this.isContainerSlideDisplayed = this.containerSlide.attr( "style" ) ? (this.containerSlide.attr( "style" ) == "display: block;" ) : false;
 
             /** ************ CREATE ************ **/
@@ -56 +59 @@
                 var divImgLogout = $( document.createElement( "div" ) );
                 divImgLogout.addClass( "containerImgLogout" );
-                divImgLogout.append( "<img src='resources/images/utils/logout.png' width='15px' height='15px" );
+                divImgLogout.append( "<img src='resources/images/utils/logout.png' width='15px' height='15px/>" );
                 divImgLogout.bind( "click", this.onClickLogout );
                 loginMiddle.append( divImgLogout );
@@ -105 +108 @@
         createLeftSlides: function()
         {
-            $( "#buttonSlideLeft" ).click( function()
-            {
-                $( "#slideLeft" ).animate( {width:"toggle"}, 500 );
-            } )
+            var divSlideCredits = $( document.createElement( "div" ) );
+            divSlideCredits.attr( {id:"slideCredits"} );
+            divSlideCredits.append( "<img src='resources/icons/man_credits.gif' width='50px' height='50px'/><br/>" );
+            divSlideCredits.bind( "click", jQuery.proxy( this.onClickSlideCredits, this ) );
+            this.containerSlides.append( divSlideCredits );
+
+            var divSlideMentions = $( document.createElement( "div" ) );
+            divSlideMentions.attr( {id:"slideMentions"} );
+            divSlideMentions.append( "<img src='resources/icons/man_mentions_2.png' width='50px' height='50px'/><br/>" );
+            divSlideMentions.bind( "click", jQuery.proxy( this.onClickSlideMentions, this ) );
+            this.containerSlides.append( divSlideMentions );
+
+            var divSlideInfos = $( document.createElement( "div" ) );
+            divSlideInfos.attr( {id:"slideInfos"} );
+            divSlideInfos.append( "<img src='resources/icons/man_info.gif' width='50px' height='50px'/>" );
+            divSlideInfos.bind( "click", jQuery.proxy( this.onClickSlideInfos, this ) );
+            this.containerSlides.append( divSlideInfos );
         },
 
@@ -133 +149 @@
         {
             document.location.href = "mailto:" + this.webmaster + "?subject=[MEGAPOLI]";
+        },
+
+        onClickSlideCredits: function()
+        {
+            this.onClickSlide( $( "#slideMentions" ), $( "#slideInfos" ), "CREDITS" );
+        },
+
+        onClickSlideMentions: function()
+        {
+            this.onClickSlide( $( "#slideCredits" ), $( "#slideInfos" ), "MENTIONS LEGALES" );
+        },
+
+        onClickSlideInfos: function()
+        {
+            this.onClickSlide( $( "#slideCredits" ), $( "#slideMentions" ), "INFOS" );
+        },
+
+        onClickSlide: function( unClickedSlide1, unClickedSlide2, slideContent )
+        {
+            this.isContainerSlideDisplayed = ("display: block;" == this.containerSlide.attr( "style" ) );
+            if( this.isContainerSlideDisplayed )
+            {
+                this.containerSlide.animate( {width:"toggle"}, 500 );
+                unClickedSlide1.delay( 500 ).animate( {width:"toggle"}, 500 );
+                unClickedSlide2.delay( 500 ).animate( {width:"toggle"}, 500 );
+            }
+            else
+            {
+                unClickedSlide1.animate( {width:"toggle"}, 500 );
+                unClickedSlide2.animate( {width:"toggle"}, 500 );
+                this.containerSlide.delay( 500 ).animate( {width:"toggle"}, 500 );
+                $( "#slideContent" ).html( slideContent );
+            }
         }
     } );

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

@@ -45 +45 @@
 <bean:define id="access" value="access"/>
 
+<%-- ************************************************************************************************************** --%>
+<%-- *************************************************** LOGO ETHER *********************************************** --%>
+<%-- ************************************************************************************************************** --%>
+<div id="linkLogoEther" class="containerLinkLogoEther"></div>
+
+<div id="logoEther" class="containerLogoEther">
+    <html:link href="http://ether.ipsl.jussieu.fr" target="help"><img src="resources/images/logo_Ether.jpg" width="80px" height="80px"/></html:link>
+</div>
+
 
 <%-- ************************************************************************************************************** --%>
@@ -69 +78 @@
 
                     <p class="forgot">
-                        <a id="resend_password_link"
-                           href="mailto:${webmaster}?subject=[MEGAPOLI] password"><bean:message key="data.authentification.pwdForget"/></a>
+                        <a id="resend_password_link" href="mailto:${webmaster}?subject=[MEGAPOLI] password"><bean:message key="data.authentification.pwdForget"/></a>
                     </p>
 
@@ -118 +126 @@
                     <ul>
                         <logic:notPresent name="SES_USER" scope="session">
-                            <li><html:link page="/InitLogonAccess.do" paramName="access" paramId="source"><span><bean:message key="data.access.extract.short"/></span></html:link></li>
+                            <li><html:link page="/InitLogonAccess.do" paramName="access" paramId="source"><span><bean:message key="data.access.extract.short"/></span></html:link>
+                            </li>
                             <li><html:link page="/InitLogon.do" paramName="upload" paramId="source"><span><bean:message key="data.upload.short"/></span></html:link></li>
                         </logic:notPresent>
@@ -166 +175 @@
 <%-- **************************************************** SLIDES ************************************************** --%>
 <%-- ************************************************************************************************************** --%>
-<div id="leftSlides">
-
-
-    <div id="buttonSlideLeft" class="containerButtonSlideLeft" style="background-color:blue">
-        button !!!!
-    </div>
-    <br/>
-    <br/>
-
-    <div id="slideLeft" class="containerSlideLeft" style="background-color:blue">
-        kljfsdkljfsldfjsdklfj s
-        qsdqdqsd
-    </div>
-
+<div id="leftSlides" class="containerLeftSlides">
+    <div id="slideContent" class="containerSlideContent"></div>
+    <div id="slides" class="containerSlides"></div>
 </div>