Changeset 345
- Timestamp:
- 01/11/12 18:10:52 (12 years ago)
- Location:
- ether_2012/trunk/web
- Files:
-
- 3 added
- 9 edited
- 3 copied
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
ether_2012/trunk/web/WEB-INF/tlds/struts-bean.tld
r330 r345 224 224 </tag> 225 225 <tag> 226 <name>p lateform</name>226 <name>parameter</name> 227 227 <tagclass>org.apache.struts.taglib.bean.ParameterTag</tagclass> 228 228 <teiclass>org.apache.struts.taglib.bean.ParameterTei</teiclass> … … 378 378 </tag> 379 379 </taglib> 380 381 382 -
ether_2012/trunk/web/WEB-INF/tlds/struts-html.tld
r330 r345 1 <? com.medias.xml version="1.0" encoding="UTF-8"?>1 <?xml version="1.0" encoding="UTF-8"?> 2 2 3 3 -
ether_2012/trunk/web/WEB-INF/web.xml
r330 r345 6 6 xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> 7 7 8 <display-name> Project_source</display-name>8 <display-name>Ether</display-name> 9 9 10 10 <welcome-file-list>Â Â … … 28 28 </listener> 29 29 30 <!-- TAGLIBS -->31 <!--<taglib>-->32 <!--<taglib-uri>http://java.sun.com/jstl/core</taglib-uri>-->33 <!--<taglib-location>/WEB-INF/tags/htmlJsp.tag</taglib-location>-->34 <!--</taglib>-->35 36 <!--<taglib>-->37 <!--<taglib-uri>http://java.sun.com/jstl/core</taglib-uri>-->38 <!--<taglib-location>/WEB-INF/tags/htmlResourceJsp.tag</taglib-location>-->39 <!--</taglib>-->40 41 <!--<taglib>-->42 <!--<taglib-uri>http://java.sun.com/jstl/core</taglib-uri>-->43 <!--<taglib-location>/WEB-INF/tags/htmlCss.tag</taglib-location>-->44 <!--</taglib>-->45 46 <!--<taglib>-->47 <!--<taglib-uri>http://java.sun.com/jstl/core</taglib-uri>-->48 <!--<taglib-location>/WEB-INF/tags/htmlJs.tag</taglib-location>-->49 <!--</taglib>-->50 51 30 <!--SERVLETS --> 52 31 <servlet> 53 <servlet-name> visualization</servlet-name>32 <servlet-name>eponge</servlet-name> 54 33 <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class> 55 34 <init-param> … … 62 41 63 42 <servlet-mapping> 64 <servlet-name> visualization</servlet-name>43 <servlet-name>eponge</servlet-name> 65 44 <url-pattern>/visualization</url-pattern> 45 </servlet-mapping> 46 47 <servlet-mapping> 48 <servlet-name>eponge</servlet-name> 49 <url-pattern>/data</url-pattern> 50 </servlet-mapping> 51 52 <servlet-mapping> 53 <servlet-name>eponge</servlet-name> 54 <url-pattern>/project</url-pattern> 55 </servlet-mapping> 56 57 <servlet-mapping> 58 <servlet-name>eponge</servlet-name> 59 <url-pattern>/backoffice</url-pattern> 66 60 </servlet-mapping> 67 61 -
ether_2012/trunk/web/init.jsp
r337 r345 1 <%@ page contentType="text/html; charset=UTF-8" %>2 <%@ page language="java" contentType="text/html; charset=UTF-8" %>3 <%@ taglib prefix=" ether" tagdir="/WEB-INF/tags" %>1 <%@ page contentType="text/html;charset=UTF-8" language="java" %> 2 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> 3 <%@ taglib prefix="tiles" uri="/WEB-INF/tlds/struts-tiles.tld" %> 4 4 5 5 <tiles:insert page="/resources/templates/templateEther.jsp" flush="true"> … … 8 8 <tiles:put name="insertJsOrJsp" type="string"></tiles:put> 9 9 10 11 <tiles:put name="title" type="string"><bean:message key="app.title"/> - <bean:message key="data"/></tiles:put> 12 <tiles:put name="nav" type="string"><html:link page="/index.jsp"><bean:message key="app.home"/></html:link></tiles:put> 10 <tiles:put name="title" type="string"><spring:message code="label.ether"/> - <spring:message code="label.home"/></tiles:put> 11 <tiles:put name="nav" type="string"><spring:message code="label.home"/></tiles:put> 13 12 14 13 15 14 <%-- ****************** CONTENT ****************** --%> 16 <tiles:put name="bodytitle" type="string">< bean:message key="data.title"/></tiles:put>15 <tiles:put name="bodytitle" type="string"><spring:message code="label.home"/></tiles:put> 17 16 18 17 <tiles:put name="body" type="string"> 19 <bean:message key="data.intro0"/> 20 <bean:message key="data.intro1"/><html:link href="mailto:${webmaster}?subject=[MEGAPOLI]">webmaster</html:link>. 21 <bean:define id="upload" value="upload"/> 22 <bean:define id="access" value="access"/> 23 <ul> 24 <li> 25 <html:link page="/data/catalogResume.jsp"><bean:message key="data.access"/></html:link>: <bean:message key="data.access.intro"/> 26 </li> 27 <li> 28 <a onclick='javascript:neededLogin("/DataAccess.do")'><bean:message key="data.access.extract"/></a> : <bean:message key="data.access.intro2"/> 29 </li> 30 <li> 31 <a onclick='javascript:neededLogin("/PrepareTree.do")'><bean:message key="data.upload"/></a> : <bean:message key="data.upload.intro"/> 32 </li> 33 </ul> 18 zzzzzz 34 19 </tiles:put> 35 20 -
ether_2012/trunk/web/init_sauv.jsp
r337 r345 1 <%@ page import="com.ether.Context" %> 2 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> 3 <%@ page contentType="text/html;charset=UTF-8" language="java" %> 4 5 <html> 6 <head> 7 <meta http-equiv="content-type" content="text/html; charset=iso-8859-1"> 8 <META HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE"> 9 10 <script src="resources/js/autocomplete/javascript/prototype.js" type="text/javascript"></script> 11 <script src="resources/js/autocomplete/javascript/effects.js" type="text/javascript"></script> 12 <script src="resources/js/autocomplete/javascript/controls.js" type="text/javascript"></script> 13 <link rel="stylesheet" href="resources/css/autocomplete/style.css" type="text/css"/> 14 15 16 <title>Project source</title> 17 </head> 18 19 <body> 20 21 22 <%=Context.getLocale( request )%> 23 24 <spring:message code="label.language" htmlEscape="true"/> : <spring:message code="language" htmlEscape="true"/> 25 26 <br/><br/> 27 28 <spring:message code="text.change.language" htmlEscape="true"/> 29 <br/> 30 <spring:message code="label.language" htmlEscape="true"/> : <a 31 href="visualization?methodName=home&language=en"><spring:message code="label.language.en" 32 htmlEscape="true"/></a> 33 | <a href="visualization?methodName=home&language=fr"><spring:message code="label.language.fr" htmlEscape="true"/></a> 34 35 <hr> 36 <h3><spring:message code="titre.init" htmlEscape="true"/></h3> 37 <hr> 38 39 <table width="100%"> 40 <tr> 41 <td> 42 <a href="visualization?methodName=view"><spring:message code="text.visu.href" htmlEscape="true"/></a> 43 </td> 44 <td><spring:message code="text.visu" htmlEscape="true"/></td> 45 </tr> 46 47 <tr> 48 <td> 49 <a href="visualization?methodName=viewAllPlateforms"><spring:message code="text.visu.pf.href" 50 htmlEscape="true"/></a> 51 </td> 52 <td><spring:message code="text.visu.pf" htmlEscape="true"/></td> 53 </tr> 54 55 </table> 56 57 <BR/><BR/> 58 <hr> 59 <h3>Auto-completion</h3> 60 <hr> 61 62 <div id="container"> 63 <form method="get" action=""> 64 <label for="testinput">Search for a country name</label><br/> 65 <input type="text" id="search" name="search" autocomplete="off" class="input" value=""/><br/> 66 67 <div id="update" style="display: none; position:relative;"></div> 68 <input type="image" name="register" class="submit-btn" src="http://www.roscripts.com/images/btn.gif" 69 alt="submit" title="submit"/> 70 </form> 71 72 <script type="text/javascript"> 73 new Ajax.Autocompleter( 'search', 'update', 'response.php', { tokens: ','} ); 74 </script> 75 </div> 76 77 </body> 78 </html> -
ether_2012/trunk/web/resources/css/mainEther.css
r342 r345 1 body{ 2 font-size: 14px; 1 html { 2 border: 0 none; 3 margin: 0; 4 padding: 0; 3 5 } 4 6 5 .pair,.impair { 6 width: 234px; 7 padding-top: 3px; 8 padding-bottom: 3px; 7 body, table { 8 font-size: 13px; 9 line-height: 1.7em; /*color: #333333;*/ 10 color: #04155D; 11 font-family: Trebuchet MS, Arial, san-serif; 9 12 } 10 13 11 .pair { 12 background-color:#f5f3ec; 14 .pageWrapper { 15 width: 980px; 16 text-align: left; 17 margin: -13px auto; 13 18 } 14 19 15 .impair { 16 background-color:#FFFDF6; 20 a img { 21 border-width: 0; 22 } 23 24 a { 25 color: #165076; 26 text-decoration: none; 27 } 28 29 a:hover { 30 text-decoration: none; 31 color: #2277BB; 32 } 33 34 a:visited { 35 text-decoration: none; 36 color: #618EAC; 37 } 38 39 input { 40 -moz-border-radius: 4px 4px 4px 4px; 41 -webkit-border-radius: 4px 4px 4px 4px; 42 } 43 44 .pair:hover, .impair:hover { 45 -moz-border-radius: 4px 4px 4px 4px; 46 background: none repeat scroll 0 0 #70739C; 47 color: #E1DEF1; 48 text-decoration: none; 17 49 } 18 50 19 51 .bindedText { 20 color: #6178BC; 21 text-decoration: none; 52 color: #6178BC; 53 text-decoration: none; 54 } 55 56 .navStyle { 57 position: absolute; 58 top: -13px; 22 59 } 23 60 … … 26 63 /** ************************************ **/ 27 64 .error, .alert, .notice, .success, .info, .loading { 28 29 30 31 65 padding: 0.5em; 66 margin: 0.5em auto; 67 border: 2px solid #ddd; 68 text-align: center; 32 69 } 33 70 34 71 .error, .alert { 35 36 37 72 background: #fbe3e4; 73 color: #8a1f11; 74 border-color: #fbc2c4; 38 75 } 39 76 40 77 .notice { 41 42 43 78 background: #fff6bf; 79 color: #514721; 80 border-color: #ffd324; 44 81 } 45 82 46 83 .success { 47 48 49 84 background: #e6efc2; 85 color: #264409; 86 border-color: #c6d880; 50 87 } 51 88 52 89 .info { 53 54 55 90 background: #d5edf8; 91 color: #205791; 92 border-color: #92cae4; 56 93 } 57 94 58 .loading 59 { 60 border: none; 95 .loading { 96 border: none; 61 97 } 62 98 … … 65 101 /** ************************************ **/ 66 102 .loading-classic { 67 background-image: url("resources/icons/loading.gif");68 height: 35px;69 width: 35px;103 background-image: url(../../resources/icons/transparent_loading.gif); 104 height: 16px; 105 width: 16px; 70 106 } 71 72 /** ************************************ **/73 /** ************* OTHERS *************** **/74 /** ************************************ **/75 #messages {76 color:#806159;77 font-weight:bold;78 vertical-align:middle;79 /*margin-bottom:1em;*/80 }81 82 83 #containerPlateforms {84 color:#6178BC;85 } -
ether_2012/trunk/web/resources/css/megapoli.css
r339 r345 16 16 /** ********************** CONTAINER ******************** **/ 17 17 /** ***************************************************** **/ 18 .containerLinkLogoEther {19 position: absolute;20 top: 0;21 left: 127px;22 width: 10px;23 height: 99px;24 background-image: url("../images/link_logo_Ether.png");25 background-repeat: repeat-y;26 }27 28 18 .containerLogoEther { 29 19 position: absolute; … … 39 29 } 40 30 41 .containerSmallLogoEther { 42 float: right; 43 margin-right: 15px; 44 } 45 46 .containerMegapoli { 31 .containerTools { 32 position: absolute; 33 top: 100px; 34 left: 50px; 35 -moz-border-radius: 4px 4px 4px 4px; 36 -moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.3); 37 -webkit-border-radius: 4px 4px 4px 4px; 38 -webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.3); 39 width: 80px; 40 height: 80px; 41 padding: 15px; 42 } 43 44 .containerEther { 47 45 -moz-border-radius: 4px 4px 4px 4px; 48 46 -moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.3); … … 380 378 /** ************************ PAGES ********************** **/ 381 379 /** ***************************************************** **/ 382 #t itle_tools, #title_tools .links li a {380 #tools, #tools .links li a { 383 381 height: 39px; 384 382 } 385 383 386 #t itle_tools {384 #tools { 387 385 font: 12px/18px Trebuchet MS, Arial, san-serif; 388 386 margin: 18px auto 12px; -
ether_2012/trunk/web/resources/templates/templateEther.jsp
r344 r345 2 2 <%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %> 3 3 <%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %> 4 <%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>5 4 <%@ taglib prefix="ether" tagdir="/WEB-INF/tags" %> 6 5 … … 42 41 43 42 <%-- ************************************************************************************************************** --%> 44 <%-- *************************************************** LOGO ETHER *********************************************** --%>45 <%-- ************************************************************************************************************** --%>46 <div id="linkLogoEther" class="containerLinkLogoEther"></div>47 48 <div id="logoEther" class="containerLogoEther">49 <html:link href="http://ether.ipsl.jussieu.fr" target="help"><img src="resources/images/logo_Ether.jpg" width="80px" height="80px"/></html:link>50 </div>51 52 53 <%-- ************************************************************************************************************** --%>54 43 <%-- **************************************************** WRAPPER ************************************************* --%> 55 44 <%-- ************************************************************************************************************** --%> 56 45 <div class="pageWrapper"> 57 46 47 <%-- ****************** LOGO ETHER ****************** --%> 48 <div id="logoEther" class="containerLogoEther"> 49 <html:link href="http://ether.ipsl.jussieu.fr" target="help"><img src="resources/images/logo_Ether.jpg" width="80px" height="80px"/></html:link> 50 </div> 51 58 52 <%-- ****************** TITLE & TOOLS ****************** --%> 59 <div id="t itle_tools" class="containerMegapoli">53 <div id="tools" class="containerTools"> 60 54 <div id="title"></div> 61 55 … … 82 76 83 77 <%-- ****************** CONTENT ****************** --%> 84 <div id="containerCenter" class="container MegapolicontainerCenter">78 <div id="containerCenter" class="containerEther containerCenter"> 85 79 <tiles:insert attribute="body"/> 86 80 </div> 87 81 88 82 <%-- ****************** BOTTOM ****************** --%> 89 <div id="containerBottom" class="container MegapolicontainerBottom" align="right">83 <div id="containerBottom" class="containerEther containerBottom" align="right"> 90 84 © 2010-2011 <html:link href="http://ether.ipsl.jussieu.fr" target="help">ETHER </html:link>/ CNRS 91 85 </div> -
ether_2012/trunk/web/resources/templates/templateEther_script.jsp
r344 r345 36 36 var homeButton = new Button( {value:templateTexts["app.home"], parent:this.containerTools, id:"button_home", className: "gray_button", classNameText:"blue_button_text", onClick:this.onClickHome} ); 37 37 38 var divSmallLogoEther = $( document.createElement( "div" ) );39 divSmallLogoEther.attr( {id:"smallLogoEther", class:"containerSmallLogoEther"} );40 divSmallLogoEther.append( '<a href="http://ether.ipsl.jussieu.fr" target="help"><img src="resources/images/logo_Ether.jpg" width="40px" height="40px"/></a>' );41 this.containerTools.append( divSmallLogoEther );42 $( "#smallLogoEther" ).show();38 // var divSmallLogoEther = $( document.createElement( "div" ) ); 39 // divSmallLogoEther.attr( {id:"smallLogoEther", class:"containerSmallLogoEther"} ); 40 // divSmallLogoEther.append( '<a href="http://ether.ipsl.jussieu.fr" target="help"><img src="resources/images/logo_Ether.jpg" width="40px" height="40px"/></a>' ); 41 // this.containerTools.append( divSmallLogoEther ); 42 // $( "#smallLogoEther" ).show(); 43 43 44 44 this.updateLogoEther(); -
ether_2012/trunk/web/src/messages_en.properties
r330 r345 34 34 data.visualization.loading.data=Data loading 35 35 36 label.ether=Ether 37 label.home=Home 38 home.title=Centre for Atmospheric Chemistry Products and Services -
ether_2012/trunk/web/src/messages_fr.properties
r330 r345 34 34 data.visualization.button.download=T\u00E9l\u00E9chargement 35 35 data.visualization.loading.data=Chargement des donn\u00E9es 36 37 38 39 label.ether=Ether 40 label.home=Accueil 41 home.title=Centre de Produits et Services de la Chimie de l'AtmosphÚre
Note: See TracChangeset
for help on using the changeset viewer.