Changeset 269 for ether_megapoli/trunk/web/resources

Timestamp:

11/29/11 17:07:57 (13 years ago)

Author:

vmipsl

Message:

BO User

Location:

ether_megapoli/trunk/web/resources

Files:

• css/megapoli.css (modified) (3 diffs)
• js/classesForJQuery/LoginButton.js (modified) (4 diffs)
• jsp/informations_en.jsp (modified) (1 diff)
• jsp/informations_fr.jsp (modified) (1 diff)
• jsp/megapoliHead.jsp (modified) (1 diff)
• templates/templateBackoffice.jsp (modified) (4 diffs)

ether_megapoli/trunk/web/resources/css/megapoli.css

@@ -153 +153 @@
 
 .containerBottom {
-/*background-image: url("../images/elements/button_middle.png");*/
     background-image: url("../images/elements/button_middle_3.png");
     background-repeat: repeat-x;
@@ -161 +160 @@
     position: relative;
     top: -32px;
-    width: 975px;
+    width: 972px;
 }
 
@@ -275 +274 @@
     -moz-border-radius: 4px;
     -webkit-border-radius: 4px;
+    border: 1px solid;
+    width: 100%;
 }
 

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

@@ -17 +17 @@
         this.urlLogin = param.urlLogin ? param.urlLogin : false;
         this.urlLogout = param.urlLogout ? param.urlLogout : false;
+        this.classNameToAdd = param.classNameToAdd ? param.classNameToAdd : false;
 
         // Texts
@@ -102 +103 @@
                 textLogin += " (" + this.text1 + ")";
 
-            var loginButton = new ComplexButton( {value:textLogin, parent:this.parent, id:"button_login"} );
+            var loginButton = new ComplexButton( {value:textLogin, parent:this.parent, id:"button_login", classNameToAdd: this.classNameToAdd} );
 
             $( "#button_login #button_middle #button_text" ).addClass( "containerUserLogout" );
@@ -117 +118 @@
             this.createLoginForm();
 
-            var loginButton = new ComplexButton( {value:this.connexionText, parent:this.parent, id:"button_login"} );
+            var loginButton = new ComplexButton( {value:this.connexionText, parent:this.parent, id:"button_login", classNameToAdd: this.classNameToAdd} );
 
             var loginMiddle = $( "#button_login #button_middle" );
             loginMiddle.empty();
-            loginMiddle.attr( {id:"topnav", class:"topnav complexButton_middle"} );
+//            loginMiddle.attr( {id:"topnav", class:"topnav complexButton_middle"} );
+            loginMiddle.attr( {id:"topnav"} );
             var aLogin = $( document.createElement( "a" ) );
             aLogin.attr( {id:"button_login_a", href:"login", class:"signin"} );
@@ -162 +164 @@
     },
 
-    // TODO : vérifier cette méthode
     showLogin: function( text )
     {

ether_megapoli/trunk/web/resources/jsp/informations_en.jsp

@@ -7 +7 @@
     <div class="title2">Browsers</div>
     This site was created and tested with the following configurations :
-    <table class="roundTable" width="100%" border="1">
+    <table class="roundTable" border="1">
         <tr>
             <th>&nbsp;Operatin System&nbsp;</th>

ether_megapoli/trunk/web/resources/jsp/informations_fr.jsp

@@ -7 +7 @@
     <div class="title2">Navigateurs</div>
     Ce site web a été conçu et testé sous les navigateurs suivants :
-    <table class="roundTable" width="100%" border="1">
+    <table class="roundTable" border="1">
         <tr>
             <th>&nbsp;SystÚme d'exploitation&nbsp;</th>

ether_megapoli/trunk/web/resources/jsp/megapoliHead.jsp

@@ -151 +151 @@
 
     } );
-
-    /** *********************************************** **/
-    /** ******************** USER ********************* **/
-    /** *********************************************** **/
-    function getJSONUser()
-    {
-        alert( getLoginModule().getJSONUser() );
-        return getLoginModule().getJSONUser();
-    }
-
-    function getPath()
-    {
-        return InterfaceTemplate.path;
-    }
-
-    function setPath( path )
-    {
-        InterfaceTemplate.path = path;
-    }
-
-    function getLoginModule()
-    {
-        return InterfaceTemplate.loginModule;
-    }
-
-    function setLoginModule( loginModule )
-    {
-        InterfaceTemplate.loginModule = loginModule;
-    }
-
-    function neededLogin( href )
-    {
-        $( "#signin_menu" ).ready( function()
-        {
-            if( !getJSONUser() )
-                getLoginModule().showLogin( loginTexts["data.authentification.text"] );
-            else
-                document.location.href = getPath() + href;
-        } );
-    }
 </script>

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

@@ -43 +43 @@
 
 <%-- ************************************************************************************************************** --%>
+<%-- *************************************************** 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>
+
+
+<%-- ************************************************************************************************************** --%>
 <%-- **************************************************** WRAPPER ************************************************* --%>
 <%-- ************************************************************************************************************** --%>
@@ -64 +74 @@
     </div>
 
-    <%-- ****************** NAV ****************** --%>
-    <div id="nav" class="containerNav"><tiles:insert attribute="nav"/></div>
-
     <%-- ****************** MENU ****************** --%>
     <div id="menuBO" class="containerMenu"></div>
@@ -87 +94 @@
 </div>
 
-<%-- ************************************************************************************************************** --%>
-<%-- **************************************************** SLIDES ************************************************** --%>
-<%-- ************************************************************************************************************** --%>
-<div id="creditSlide" class="containerSlide"></div>
-<div id="mentionSlide" class="containerSlide"></div>
-<div id="infoSlide" class="containerSlide"></div>
-
 <script type="text/javascript">
     var templateTexts = $A( "" );
@@ -102 +102 @@
     templateTexts["data.upload.metadata.contact.mail"] = '<bean:message key="data.upload.metadata.contact.mail"/>';
     templateTexts["app.admin"] = '<bean:message key="app.admin"/>';
+    templateTexts["bo.user"] = '<bean:message key="bo.user"/>';
 
     // Needed texts if you use the library LoginButton.js