Changeset 170 for ether_megapoli
- Timestamp:
- 08/26/11 20:24:00 (13 years ago)
- Location:
- ether_megapoli/trunk
- Files:
-
- 3 added
- 17 edited
- 1 copied
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
ether_megapoli/trunk/build.xml
r156 r170 109 109 <classes dir="${conf.dir}" prefix="WEB-INF/classes"> 110 110 <!-- Ajout du fichier de configuration d'Hiberante --> 111 <include name="hibernate.properties"/>112 111 <include name="hibernate.cfg.xml"/> 113 112 <!-- /Hibernate --> -
ether_megapoli/trunk/build_sauv.xml
r147 r170 109 109 <classes dir="${conf.dir}" prefix="WEB-INF/classes"> 110 110 <!-- Ajout du fichier de configuration d'Hiberante --> 111 <include name="hibernate.properties"/>112 111 <include name="hibernate.cfg.com.medias.xml"/> 113 112 <!-- /Hibernate --> -
ether_megapoli/trunk/persistence/implementation/hibernate.properties
r156 r170 7 7 #hibernate.c3p0.max_statements=50 8 8 #hibernate.c3p0.idle_test_period=3000 9 #hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect9 hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect -
ether_megapoli/trunk/service/implementation/com/medias/megapoli/utils/MegapoliInitialisation.java
r152 r170 106 106 // this.getServletContext ().setAttribute ("APP_ACCESSTREE", accessTree); 107 107 108 // Initialisation d'Hibernate109 try {110 CommunicationBD.open();111 CommunicationBD.getList("select count(*) from Jeu");112 // System.out.println("nombre de jeux insérés="+nbjeux.get(0));113 CommunicationBD.close();114 } catch (HibernateException e) {115 e.printStackTrace();116 }117 118 108 //on charge l'annuaire et on le met aussi au niveau de l'appli... 119 109 Annuaire annu = new Annuaire(prop.getProperty("annuaire")); … … 127 117 String urlCGI = prop.getProperty("url.extractcgi"); 128 118 this.getServletContext().setAttribute("APP_CGI", urlCGI); 119 120 // Initialisation d'Hibernate 121 try { 122 CommunicationBD.open(); 123 CommunicationBD.getList("select count(*) from Jeu"); 124 // System.out.println("nombre de jeux insérés="+nbjeux.get(0)); 125 CommunicationBD.close(); 126 } catch (HibernateException e) { 127 e.printStackTrace(); 128 } 129 129 } 130 130 } -
ether_megapoli/trunk/service/implementation/com/medias/utils/hibernate/SessionManager.java
r168 r170 24 24 * CONFIG_FILE_LOCATION = "/com/foo/bar/myhiberstuff.conf.xml".</code> 25 25 */ 26 private static String CONFIG_FILE_LOCATION = "/hibernate .cfg.xml";26 private static String CONFIG_FILE_LOCATION = "/hibernate-domain.cfg.xml"; 27 27 28 28 /** Holds a single instance of Session */ -
ether_megapoli/trunk/web/WEB-INF/struts-config.xml
r155 r170 83 83 <global-forwards> 84 84 <forward name="index" path="/index.jsp"/> 85 <forward name="failure" path="/ templates/errors.jsp"/>85 <forward name="failure" path="/resources/templates/errors.jsp"/> 86 86 </global-forwards> 87 87 -
ether_megapoli/trunk/web/contact/nav.jsp
r159 r170 4 4 <%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean"%> 5 5 <%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic"%> 6 6 7 <!-- barre décrivant la position de la page dans l'arborescence du site --> 7 8 <html:link page="/index.jsp"><bean:message key="app.home"/></html:link>> -
ether_megapoli/trunk/web/index.jsp
r154 r170 5 5 <%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean"%> 6 6 <%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic"%> 7 8 7 9 8 <tiles:insert page="/resources/templates/template.jsp" flush="true"> … … 15 14 <ul><li><html:link page="/index.jsp"><bean:message key="app.home"/></html:link></li></ul> 16 15 </tiles:put> 17 16 18 17 <tiles:put name="title" type="string"> 19 18 <bean:message key="app.title"/> - <bean:message key="data"/> … … 28 27 29 28 <bean:message key="data.intro0"/> 30 <bean:message key="data.intro1"/><html:link href="mailto:${webmaster}?subject=[MEGAPOLI]">webmaster</html:link>. 29 <bean:message key="data.intro1"/><html:link href="mailto:${webmaster}?subject=[MEGAPOLI]">webmaster</html:link>. 31 30 <bean:define id="upload" value="upload"/> 32 31 <bean:define id="access" value="access"/> -
ether_megapoli/trunk/web/resources/css/ether.css
r89 r170 12 12 color: #6178BC; 13 13 text-decoration: none; 14 } 15 16 .navStyle { 17 position: absolute; 18 top: -13px; 14 19 } 15 20 -
ether_megapoli/trunk/web/resources/templates/errors.jsp
r154 r170 9 9 10 10 <bean:define type="java.lang.String" id="relativePath" value="<%=Context.getRelativePath(request)%>"/> 11 12 <tiles:put name="nav" value='<%=relativePath+"/nav.jsp"%>'/> 11 <tiles:put name="nav" value=''/> 13 12 14 13 <tiles:put name="title" type="string"> -
ether_megapoli/trunk/web/resources/templates/template.jsp
r155 r170 1 <%@ page language="java" import="com.medias. *" %>2 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %>3 <%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %>4 <%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %>5 <%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>6 <%@ taglib uri="/WEB-INF/tlds/struts-nested.tld" prefix="nested" %>1 <%@ page language="java" import="com.medias.Context" %> 2 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %> 3 <%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %> 4 <%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %> 5 <%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %> 6 <%@ taglib uri="/WEB-INF/tlds/struts-nested.tld" prefix="nested" %> 7 7 8 8 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> … … 11 11 <html> 12 12 <head> 13 14 15 16 17 18 19 20 13 <title><tiles:getAsString name="title"/></title> 14 <meta http-equiv="content-type" content="text/html; charset=UTF-8"> 15 <META HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE"> 16 <link rel="stylesheet" type="text/css" href="<html:rewrite page='/resources/css/medias_new.css'/>"> 17 <link rel="stylesheet" type="text/css" href="<html:rewrite page='/resources/css/megapoli.css'/>"> 18 <link rel="shortcut icon" href="<html:rewrite page='/resources/images/megapoli/favicon.ico'/>"> 19 <script src="<html:rewrite page='/resources/js/maj.js'/>"></script> 20 <script src="<html:rewrite page='/resources/js/medias/ajax.js'/>"></script> 21 21 <script src="<html:rewrite page='/resources/js/medias/scw.js'/>"></script> 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 22 <script type="text/javascript"> 23 <!-- 24 var popup; 25 26 function popupWindow (url, name, configuration) 27 { 28 popup = window.open (url, name, configuration); 29 } 30 31 function closePopupWindow () 32 { 33 popup.close (); 34 } 35 --> 36 </script> 37 37 </head> 38 38 39 39 <body> 40 40 <a name="top"></a> 41 41 42 42 <%-- VARIABLES A NE PAS TOUCHER !!! --%> 43 44 45 46 47 48 49 50 43 <bean:define type="java.lang.String" id="today" value="<%=Context.getSimpleDate()%>"/> 44 <bean:define type="java.lang.String" id="lastModified" value="<%=Context.getLastModified(request, application)%>"/> 45 <bean:define type="java.lang.String" id="racine" value="<%=Context.getWebroot(request)%>"/> 46 <bean:define type="java.lang.String" id="relativePageUri" value="<%=Context.getRelativePageURI(request)%>"/> 47 <bean:define type="java.lang.String" id="lang" value="<%=Context.getLangue(request)%>"/> 48 <bean:define type="java.lang.String" id="webmaster" value="<%=Context.getWebmaster(request)%>"/> 49 <bean:define type="java.lang.String" id="chemin" value="<%=request.getContextPath()%>"/> 50 51 51 <div id="container"> 52 53 54 55 56 57 58 59 60 61 62 <div id="pageMiddle"> 63 64 65 52 <div id="pageHeader"> 53 <%-- le logo --%> 54 55 <%-- Le titre général du site --%> 56 <h2><%--<u>M</u>egacities: <u>E</u>missions, urban, regional and <u>G</u>lobal <u>A</u>tmospheric <u>POL</u>lution and climate effects, and <u>I</u>ntegrated tools for assessment and mitigation--%> 57 <bean:message key="app.fulltitle"/> 58 </h2> 59 </div> 60 61 62 <div id="pageMiddle"> 63 <div id="pageMenu"> 64 <div id="util"> 65 66 66 <html:link page="/index.jsp"> 67 68 69 67 <html:img page="/resources/images/utils/home.jpg" titleKey="app.home" altKey="app.home"/> 68 </html:link> 69 70 70 <html:link href="mailto:${webmaster}?subject=[MEGAPOLI]"> 71 72 71 <html:img page="/resources/images/utils/enveloppe.jpg" titleKey="app.webmaster" altKey="app.webmaster"/> 72 </html:link> 73 73 74 74 <%--html:link page="/sitemap/sitemap.jsp"> 75 <html:img page="/images/utils/sitemap.png" titleKey="app.sitemap" altKey="app.sitemap"/>76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 <html:img page="/resources/images/utils/logout.gif" titleKey="app.disconnect" altKey="app.disconnect" onmouseover="this.src='${chemin}/images/utils/logout2.gif'" onmouseout="this.src='${chemin}/images/utils/logout.gif'"/>93 94 95 96 97 75 <html:img page="/resources/images/utils/sitemap.png" titleKey="app.sitemap" altKey="app.sitemap"/> 76 </html:link--%> 77 <%-- Internationalisation --%> 78 <logic:notEqual name="lang" value="en"> 79 <html:link page="/English.do" paramName="relativePageUri" paramId="requestUri" titleKey="app.en"> 80 <html:img page="/resources/images/utils/gb.png" alt="gb"/> 81 </html:link> 82 </logic:notEqual> 83 <logic:equal name="lang" value="en"> 84 <html:link page="/French.do" paramName="relativePageUri" paramId="requestUri" titleKey="app.fr"> 85 <html:img page="/resources/images/utils/fr.png" alt="fr"/> 86 </html:link> 87 </logic:equal> 88 89 <%-- le lien pour se déconnecter de l'application --%> 90 <%--logic:present name="SES_USER" scope="session"> 91 <html:link page="/Disconnect.do"> 92 <html:img page="/resources/images/utils/logout.gif" titleKey="app.disconnect" altKey="app.disconnect" onmouseover="this.src='${chemin}/resources/images/utils/logout2.gif'" onmouseout="this.src='${chemin}/resources/images/utils/logout.gif'"/> 93 </html:link> 94 </logic:present--%> 95 </div> 96 97 <div id="plan"> 98 98 <%-- le menu --%> 99 <%--div id="menuItem"> 100 <html:link page="/projet/projet.jsp"> 101 <h3> <bean:message key="projet"/></h3> 102 </html:link> 103 <ul> 104 <li><html:link page="/projet/introduction.jsp"> 105 <bean:message key="projet.intro"/> 106 </html:link></li> 107 <li><html:link page="/projet/objectifs.jsp"> 108 <bean:message key="projet.objectifs"/> 109 </html:link></li> 110 <li><html:link page="/projet/mesures.jsp"> 111 <bean:message key="projet.mesures"/> 112 </html:link></li> 113 </ul> 114 </div--%> 115 116 <%--div id="menuItem"> 117 <html:link page="/projet/projet.jsp"> 118 <h3> <bean:message key="projet"/></h3> 119 </html:link> 120 <ul> 121 <li> <html:link page="/index.jsp"> 122 <bean:message key="app.home"/> 123 </html:link></li> 124 <li><html:link href="mailto:${webmaster}?subject=[MEGAPOLI]"> 125 <html:img page="/images/utils/mailto.png" titleKey="app.webmaster" altKey="app.webmaster"/> 126 </html:link></li> 127 <logic:present name="SES_USER" scope="session"> 128 <li> 129 <html:link page="/Disconnect.do"> 130 <bean:message key="app.disconnect"/> 131 </html:link> 132 </li> 133 </logic:present> 134 </ul> 135 </div--%> 136 137 <div id="menuItem"> 138 <%--html:link page="/data/data.jsp"> 139 <h3> <bean:message key="data"/></h3> 140 </html:link--%> 141 <bean:define id="upload" value="upload"/> 142 <bean:define id="access" value="access"/> 143 <ul> 144 <li><html:link page="/data/access/access.jsp" paramName="access" paramId="source"> 145 <bean:message key="data.access"/> 146 </html:link> 147 </li> 148 <li> > 149 <%--html:link page="/data/access/jeux.jsp" paramName="access" paramId="source"--%> 150 <html:link page="/JeuxAccess.do"> 151 <bean:message key="data.access.jeux"/> 152 </html:link> 153 </li> 154 <li> > 155 <html:link page="/ParametresAccess.do"> 156 <bean:message key="data.access.param"/> 157 </html:link> 158 </li> 159 <li> > 160 <html:link page="/CapteursAccess.do"> 161 <bean:message key="data.access.capt"/> 162 </html:link> 163 </li> 164 <li> > 165 <html:link page="/PlateformesAccess.do"> 166 <bean:message key="data.access.plat"/> 167 </html:link> 168 </li> 169 <li><br/> 170 <logic:notPresent name="SES_USER" scope="session"> 171 <html:link page="/InitLogonAccess.do" paramName="access" paramId="source"> 172 <bean:message key="data.access.extract"/> 173 </html:link> 174 </logic:notPresent> 175 <logic:present name="SES_USER" scope="session"> 176 <html:link page="/DataAccess.do"> 177 <bean:message key="data.access.extract"/> 178 </html:link> 179 </logic:present> 180 </li> 181 <li><br/> 182 <logic:notPresent name="SES_USER" scope="session"> 183 <html:link page="/InitLogon.do" paramName="upload" paramId="source"> 184 <bean:message key="data.upload"/> 185 </html:link> 186 </logic:notPresent> 187 <logic:present name="SES_USER" scope="session"> 188 <html:link page="/PrepareTree.do"> 189 <bean:message key="data.upload"/> 190 </html:link> 191 </logic:present> 192 </li> 193 </ul> 194 </div> 195 <table width="100%"> 196 <tr><td align="center"> 197 <html:link href="http://megapoli.dmi.dk/" target="help" titleKey="app.linkmegapoli"> 198 <html:img page="/resources/images/megapoli/megapoli_small.jpg" altKey="app.home"/> 199 </html:link> 200 </td></tr> 201 </table> 202 <%--div id="menuItem"> 203 <html:link page="/partenaires/partenaires.jsp"> 204 <h3> <bean:message key="partenaires"/></h3> 205 </html:link> 206 <ul> 207 <li><html:link page="/partenaires/scientifiques.jsp"> 208 <bean:message key="partenaires.scientifiques"/> 209 </html:link></li> 210 <li><html:link page="/partenaires/institutionnels.jsp"> 211 <bean:message key="partenaires.institutionnels"/> 212 </html:link></li> 213 </ul> 214 </div> 215 216 <div id="menuItem"> 217 <html:link page="/finance/finance.jsp"> 218 <h3> <bean:message key="finance"/></h3> 219 </html:link> 220 </div--%> 221 222 223 <%-- 224 <div id="menuItem> 225 <html:link page="/actualites/actualites.jsp"> 226 <h3> <bean:message key="app.actualites"/></h3> 227 </html:link> 228 </div> 229 --%> 230 </div> 231 <%-- Recherche : solution mnogosearch --%> 232 233 </div> 99 <%--div id="menuItem"> 100 <html:link page="/projet/projet.jsp"> 101 <h3> <bean:message key="projet"/></h3> 102 </html:link> 103 <ul> 104 <li><html:link page="/projet/introduction.jsp"> 105 <bean:message key="projet.intro"/> 106 </html:link></li> 107 <li><html:link page="/projet/objectifs.jsp"> 108 <bean:message key="projet.objectifs"/> 109 </html:link></li> 110 <li><html:link page="/projet/mesures.jsp"> 111 <bean:message key="projet.mesures"/> 112 </html:link></li> 113 </ul> 114 </div--%> 115 116 <%--div id="menuItem"> 117 <html:link page="/projet/projet.jsp"> 118 <h3> <bean:message key="projet"/></h3> 119 </html:link> 120 <ul> 121 <li> <html:link page="/index.jsp"> 122 <bean:message key="app.home"/> 123 </html:link></li> 124 <li><html:link href="mailto:${webmaster}?subject=[MEGAPOLI]"> 125 <html:img page="/resources/images/utils/mailto.png" titleKey="app.webmaster" altKey="app.webmaster"/> 126 </html:link></li> 127 <logic:present name="SES_USER" scope="session"> 128 <li> 129 <html:link page="/Disconnect.do"> 130 <bean:message key="app.disconnect"/> 131 </html:link> 132 </li> 133 </logic:present> 134 </ul> 135 </div--%> 136 137 <div id="menuItem"> 138 <%--html:link page="/data/data.jsp"> 139 <h3> <bean:message key="data"/></h3> 140 </html:link--%> 141 <bean:define id="upload" value="upload"/> 142 <bean:define id="access" value="access"/> 143 <ul> 144 <li><html:link page="/data/access/access.jsp" paramName="access" paramId="source"> 145 <bean:message key="data.access"/> 146 </html:link> 147 </li> 148 <li> > 149 <%--html:link page="/data/access/jeux.jsp" paramName="access" paramId="source"--%> 150 <html:link page="/JeuxAccess.do"> 151 <bean:message key="data.access.jeux"/> 152 </html:link> 153 </li> 154 <li> > 155 <html:link page="/ParametresAccess.do"> 156 <bean:message key="data.access.param"/> 157 </html:link> 158 </li> 159 <li> > 160 <html:link page="/CapteursAccess.do"> 161 <bean:message key="data.access.capt"/> 162 </html:link> 163 </li> 164 <li> > 165 <html:link page="/PlateformesAccess.do"> 166 <bean:message key="data.access.plat"/> 167 </html:link> 168 </li> 169 <li><br/> 170 <logic:notPresent name="SES_USER" scope="session"> 171 <html:link page="/InitLogonAccess.do" paramName="access" paramId="source"> 172 <bean:message key="data.access.extract"/> 173 </html:link> 174 </logic:notPresent> 175 <logic:present name="SES_USER" scope="session"> 176 <html:link page="/DataAccess.do"> 177 <bean:message key="data.access.extract"/> 178 </html:link> 179 </logic:present> 180 </li> 181 <li> 182 <logic:notPresent name="SES_USER" scope="session"> 183 <html:link page="/InitLogon.do" paramName="upload" paramId="source"> 184 <bean:message key="data.upload"/> 185 </html:link> 186 </logic:notPresent> 187 <logic:present name="SES_USER" scope="session"> 188 <html:link page="/PrepareTree.do"> 189 <bean:message key="data.upload"/> 190 </html:link> 191 </logic:present> 192 </li> 193 194 <!-- ****************************************************************** --> 195 <!-- ************************ VISUALIZATION *************************** --> 196 <!-- ****************************************************************** --> 197 <li><br/> 198 <html:link page="/visualization?methodName=view"> 199 <bean:message key="all.visualization"/> 200 </html:link> 201 </li> 202 <li> > 203 <html:link page="/visualization?methodName=viewParametersByPlateform"> 204 <bean:message key="data.visualization"/> 205 </html:link> 206 </li> 207 <li> > 208 <html:link page="/visualization/inWork.jsp"> 209 <bean:message key="simulation.visualization"/> 210 </html:link> 211 </li> 212 <!-- ****************************************************************** --> 213 214 </ul> 215 </div> 216 <table width="100%"> 217 <tr> 218 <td align="center"> 219 <html:link href="http://megapoli.dmi.dk/" target="help" titleKey="app.linkmegapoli"> 220 <html:img page="/resources/images/megapoli/megapoli_small.jpg" height="100px" width="100px" altKey="app.home"/> 221 </html:link> 222 </td> 223 </tr> 224 </table> 225 <%--div id="menuItem"> 226 <html:link page="/partenaires/partenaires.jsp"> 227 <h3> <bean:message key="partenaires"/></h3> 228 </html:link> 229 <ul> 230 <li><html:link page="/partenaires/scientifiques.jsp"> 231 <bean:message key="partenaires.scientifiques"/> 232 </html:link></li> 233 <li><html:link page="/partenaires/institutionnels.jsp"> 234 <bean:message key="partenaires.institutionnels"/> 235 </html:link></li> 236 </ul> 237 </div> 238 239 <div id="menuItem"> 240 <html:link page="/finance/finance.jsp"> 241 <h3> <bean:message key="finance"/></h3> 242 </html:link> 243 </div--%> 244 245 246 <%-- 247 <div id="menuItem> 248 <html:link page="/actualites/actualites.jsp"> 249 <h3> <bean:message key="app.actualites"/></h3> 250 </html:link> 251 </div> 252 --%> 253 </div> 254 <%-- Recherche : solution mnogosearch --%> 255 256 </div> 234 257 <%-- 235 258 <div id="recherche"> … … 239 262 </div> 240 263 --%> 241 242 264 <div id="pageContent"> 265 <div id="nav"> 243 266 <%-- la barre de navigation --%> 244 267 <div class="texte" style="float: left;"> 245 268 <tiles:insert attribute="nav"/> 246 269 </div> 247 270 <div style="float: right; font-size: 13px"> 248 <logic:present name="SES_USER" scope="session"> 249 <table> 250 <tr><td height="40px" valign="middle" style="font-size: 13px; color: white"> 251 <bean:write name="SES_USER" property="prenom"/> <bean:write name="SES_USER" property="nom"/> 252 <logic:equal name="SES_USER" property="roles" value="coordinateur"> 253 (<bean:message key="app.admin"/>) 254 </logic:equal> 255 </td> 256 <td valign="top" width="40px"> 257 <html:link page="/Disconnect.do"> 258 <html:img page="/resources/images/utils/logout.gif" titleKey="app.disconnect" altKey="app.disconnect" onmouseover="this.src='${chemin}/images/utils/logout2.gif'" onmouseout="this.src='${chemin}/images/utils/logout.gif'" width="20px" height="20px" style="margin-top:7px"/> 259 </html:link> 260 </td> 261 </tr> 262 </table> 263 </logic:present> 264 </div> 265 </div> 266 <div id="corpsPage"> 267 <div id="title"> 268 <%-- le titre de la page --%> 269 <h1><tiles:insert attribute="bodytitle"/></h1> 270 </div> 271 <div id="txt"> 272 <%-- le corps de la page --%> 273 <tiles:insert attribute="body"/> 274 </div> 275 </div> 276 </div> 277 </div> 278 279 280 <div id="pageFooter"> 281 <table width="100%" style="color:white;font-size: 12px"> 282 <tr><td align="left">© 2010-2011 <html:link href="http://www.sedoo.fr" target="help" titleKey="app.linksedoo">Sedoo</html:link> / CNRS 283 </td><td align="center"><bean:message key="app.infonavig"/> 284 </td><td align="right"><i><bean:message key="app.lastModified"/> : <bean:write name="lastModified"/></i> 285 </td></tr> 286 </table> 287 <%--div id="copyright"> 288 © 2010-2011 Sedoo / CNRS 289 </div> 290 <div id="datestamp"> 291 <bean:message key="app.lastModified"/> : <bean:write name="lastModified"/> 292 </div--%> 293 </div> 271 <logic:present name="SES_USER" scope="session"> 272 <table> 273 <tr> 274 <td height="40px" valign="middle" style="font-size: 13px; color: white"> 275 <bean:write name="SES_USER" property="prenom"/> <bean:write name="SES_USER" property="nom"/> 276 <logic:equal name="SES_USER" property="roles" value="coordinateur"> 277 (<bean:message key="app.admin"/>) 278 </logic:equal> 279 </td> 280 <td valign="top" width="40px"> 281 <html:link page="/Disconnect.do"> 282 <html:img page="/resources/images/utils/logout.gif" titleKey="app.disconnect" 283 altKey="app.disconnect" 284 onmouseover="this.src='${chemin}/resources/images/utils/logout2.gif'" 285 onmouseout="this.src='${chemin}/resources/images/utils/logout.gif'" 286 width="20px" height="20px" style="margin-top:7px"/> 287 </html:link> 288 </td> 289 </tr> 290 </table> 291 </logic:present> 292 </div> 293 </div> 294 <div id="corpsPage"> 295 <div id="title"> 296 <%-- le titre de la page --%> 297 <h1><tiles:insert attribute="bodytitle"/></h1> 298 </div> 299 <div id="txt"> 300 <%-- le corps de la page --%> 301 <tiles:insert attribute="body"/> 302 </div> 303 </div> 304 </div> 305 </div> 306 307 308 <div id="pageFooter"> 309 <table width="100%" style="color:white;font-size: 12px"> 310 <tr> 311 <td align="left">© 2010-2011 <html:link href="http://www.sedoo.fr" target="help" 312 titleKey="app.linksedoo">Sedoo</html:link> / CNRS 313 </td> 314 <td align="center"><bean:message key="app.infonavig"/> 315 </td> 316 <td align="right"><i><bean:message key="app.lastModified"/> : <bean:write name="lastModified"/></i> 317 </td> 318 </tr> 319 </table> 320 <%--div id="copyright"> 321 © 2010-2011 Sedoo / CNRS 322 </div> 323 <div id="datestamp"> 324 <bean:message key="app.lastModified"/> : <bean:write name="lastModified"/> 325 </div--%> 326 </div> 294 327 295 328 -
ether_megapoli/trunk/web/resources/templates/templateEther.jsp
r129 r170 1 1 <!-- /*** ****************** TEMPLATE ETHER ******************** **/ --> 2 <%@ page import="com.medias.Context" %> 3 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles"%> 4 <%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html"%> 5 <%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean"%> 6 <%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic"%> 7 <%@ taglib uri="/WEB-INF/tlds/struts-nested.tld" prefix="nested"%> 8 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> 2 <%@ page language="java" import="com.medias.Context" %> 3 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %> 4 <%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %> 5 <%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %> 6 <%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %> 7 <%@ taglib uri="/WEB-INF/tlds/struts-nested.tld" prefix="nested" %> 9 8 <%@ taglib prefix="ether" tagdir="/WEB-INF/tags" %> 10 9 … … 16 15 <META HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE"> 17 16 18 17 <title><tiles:getAsString name="title"/></title> 19 18 <link rel="shortcut icon" href="<html:rewrite page='/resources/images/megapoli/favicon.ico'/>"> 20 19 … … 22 21 <ether:htmlCss cssFile="megapoli"/> 23 22 24 <ether:htmlCss cssFile="ether"/> 25 <ether:htmlCss cssFile="button"/> 26 <ether:htmlCss cssFile="blueprint-css/blueprint/src/grid"/> 27 28 <tiles:insert attribute="insertCss"/> 29 <tiles:insert attribute="insertJsOrJsp"/> 23 <tiles:insert attribute="insertCss"/> 24 <tiles:insert attribute="insertJsOrJsp"/> 30 25 <ether:htmlJs jsFile="maj"/> 31 32 <script type="text/javascript"> 33 34 <!-- 35 var popup; 36 37 function popupWindow (url, name, configuration) 38 { 39 popup = window.open (url, name, configuration); 40 } 41 42 function closePopupWindow () 43 { 44 popup.close (); 45 } 46 --> 47 </script> 26 <ether:htmlJs jsFile="medias/ajax"/> 27 <ether:htmlJs jsFile="medias/scw"/> 28 29 <script type="text/javascript"> 30 31 <!-- 32 var popup; 33 34 function popupWindow (url, name, configuration) 35 { 36 popup = window.open (url, name, configuration); 37 } 38 39 function closePopupWindow () 40 { 41 popup.close (); 42 } 43 --> 44 </script> 48 45 </HEAD> 49 46 50 47 <BODY> 51 48 <a name="top"></a> 52 49 53 50 <%-- VARIABLES A NE PAS TOUCHER !!! --%> 54 <bean:define type="java.lang.String" id="today" value="<%=Context.getSimpleDate()%>"/> 55 <bean:define type="java.lang.String" id="lastModified" value="<%=Context.getLastModified(request, application)%>"/> 56 <bean:define type="java.lang.String" id="racine" value="<%=Context.getWebroot(request)%>"/> 57 <bean:define type="java.lang.String" id="relativePageUri" value="<%=Context.getRelativePageURI(request)%>"/> 58 <bean:define type="java.lang.String" id="lang" value="<%=Context.getLangue(request)%>"/> 59 <bean:define type="java.lang.String" id="chemin" value="<%=request.getContextPath()%>"/> 51 <bean:define type="java.lang.String" id="today" value="<%=Context.getSimpleDate()%>"/> 52 <bean:define type="java.lang.String" id="lastModified" value="<%=Context.getLastModified(request, application)%>"/> 53 <bean:define type="java.lang.String" id="racine" value="<%=Context.getWebroot(request)%>"/> 54 <bean:define type="java.lang.String" id="relativePageUri" value="<%=Context.getRelativePageURI(request)%>"/> 55 <bean:define type="java.lang.String" id="lang" value="<%=Context.getLangue(request)%>"/> 56 <bean:define type="java.lang.String" id="webmaster" value="<%=Context.getWebmaster(request)%>"/> 57 <bean:define type="java.lang.String" id="chemin" value="<%=request.getContextPath()%>"/> 60 58 61 59 <div id="container"> 62 60 <div id="pageHeader"> 63 <%-- le logo --%> 64 65 <%-- Internationalisation --%> 66 <logic:notEqual name="lang" value="en"> 67 <html:link page="/English.do" paramName="relativePageUri" paramId="requestUri"> 68 <html:img vspace="25" hspace="10" page="/resources/images/utils/gb.png" alt="gb"/> 69 </html:link> 70 </logic:notEqual> 71 <logic:equal name="lang" value="en"> 72 <html:link page="/French.do" paramName="relativePageUri" paramId="requestUri"> 73 <html:img vspace="25" hspace="10" page="/resources/images/utils/fr.png" alt="fr"/> 74 </html:link> 75 </logic:equal> 76 77 <%-- Le titre gï¿œnï¿œral du site --%> 78 <h2><u>M</u>egacities: <u>E</u>missions, urban, regional and <u>G</u>lobal <u>A</u>tmospheric <u>POL</u>lution and climate effects, and <u>I</u>ntegrated tools for assessment and mitigation</h2> 79 </div> 80 81 82 <div id="pageMiddle"> 83 <div id="pageMenu"> 84 <div id="util"> 85 86 <html:link page="/index.jsp"> 87 <html:img page="/resources/images/utils/home.jpg" titleKey="app.home" altKey="app.home"/> 88 </html:link> 89 90 <html:link href="mailto:vincent.pignot@aero.obs-mip.fr?subject=[MEGAPOLI]"> 91 <html:img page="/resources/images/utils/enveloppe.jpg" titleKey="app.webmaster" altKey="app.webmaster"/> 92 </html:link> 93 94 <%-- le lien pour se dï¿œconnecter de l'application --%> 95 <logic:present name="SES_USER" scope="session"> 96 <html:link page="/Disconnect.do"> 97 <html:img page="/resources/images/utils/logout.gif" titleKey="app.disconnect" altKey="app.disconnect" onmouseover="this.src='${chemin}/resources/images/utils/logout2.gif'" onmouseout="this.src='${chemin}/resources/images/utils/logout.gif'"/> 98 </html:link> 99 </logic:present> 100 </div> 101 102 <div id="plan"> 103 <div id="menuItem"> 104 <html:link page="/data/data.jsp"> 105 <h3> <bean:message key="data"/></h3> 106 </html:link> 107 <bean:define id="upload" value="upload"/> 108 <bean:define id="access" value="access"/> 109 <ul> 110 <li> 111 <logic:notPresent name="SES_USER" scope="session"> 112 <html:link page="/InitLogon.do" paramName="upload" paramId="source"> 113 <bean:message key="data.upload"/> 114 </html:link> 115 </logic:notPresent> 116 <logic:present name="SES_USER" scope="session"> 117 <html:link page="/PrepareTree.do"> 118 <bean:message key="data.upload"/> 119 </html:link> 120 </logic:present> 121 </li> 122 <li><html:link page="/data/access/access.jsp" paramName="access" paramId="source"> 123 <bean:message key="data.access"/> 124 </html:link> 125 </li> 126 <li> > 127 <%--html:link page="/data/access/jeux.jsp" paramName="access" paramId="source"--%> 128 <html:link page="/JeuxAccess.do"> 129 <bean:message key="data.access.jeux"/> 130 </html:link> 131 </li> 132 <li> > 133 <html:link page="/ParametresAccess.do"> 134 <bean:message key="data.access.param"/> 135 </html:link> 136 </li> 137 <li> > 138 <html:link page="/CapteursAccess.do"> 139 <bean:message key="data.access.capt"/> 140 </html:link> 141 </li> 142 <li> > 143 <html:link page="/PlateformesAccess.do"> 144 <bean:message key="data.access.plat"/> 145 </html:link> 146 </li> 147 148 <li> 149 <html:link page="/visualization?methodName=view"> 150 <bean:message key="data.visualization"/> 151 </html:link> 152 </li> 153 <li> > 154 <html:link page="/visualization?methodName=viewParametersByPlateform"> 155 <bean:message key="data.visualization.parameter_pf"/> 156 </html:link> 157 </li> 158 <li> > 159 <html:link page="/visualization/inWork.jsp"> 160 <bean:message key="data.visualization.parameter_pfs"/> 161 </html:link> 162 </li> 163 <li> > 164 <html:link page="/visualization/inWork.jsp"> 165 <bean:message key="data.visualization.parameters_pf"/> 166 </html:link> 167 </li> 168 <li> > 169 <html:link page="/visualization/inWork.jsp"> 170 <bean:message key="data.visualization.2D"/> 171 </html:link> 172 </li> 173 174 <li> 175 <html:link page="/visualization/inWork.jsp"> 176 <bean:message key="simulation.visualization"/> 177 </html:link> 178 </li> 179 </ul> 180 </div> 181 182 </div> 183 <%-- Recherche : solution mnogosearch --%> 184 61 <%-- le logo --%> 62 63 <%-- Le titre général du site --%> 64 <h2><%--<u>M</u>egacities: <u>E</u>missions, urban, regional and <u>G</u>lobal <u>A</u>tmospheric <u>POL</u>lution and climate effects, and <u>I</u>ntegrated tools for assessment and mitigation--%> 65 <bean:message key="app.fulltitle"/> 66 </h2> 185 67 </div> 186 68 187 <div id="pageContent"> 188 <div id="nav"> 189 <%-- la barre de navigation --%> 190 <div class="texte"> 191 <tiles:insert attribute="nav"/> 69 70 <div id="pageMiddle"> 71 <div id="pageMenu"> 72 <div id="util"> 73 74 <html:link page="/index.jsp"> 75 <html:img page="/resources/images/utils/home.jpg" titleKey="app.home" altKey="app.home"/> 76 </html:link> 77 78 <html:link href="mailto:${webmaster}?subject=[MEGAPOLI]"> 79 <html:img page="/resources/images/utils/enveloppe.jpg" titleKey="app.webmaster" 80 altKey="app.webmaster"/> 81 </html:link> 82 83 <%--html:link page="/sitemap/sitemap.jsp"> 84 <html:img page="/resources/images/utils/sitemap.png" titleKey="app.sitemap" altKey="app.sitemap"/> 85 </html:link--%> 86 <%-- Internationalisation --%> 87 <logic:notEqual name="lang" value="en"> 88 <html:link page="/English.do" paramName="relativePageUri" paramId="requestUri" titleKey="app.en"> 89 <html:img page="/resources/images/utils/gb.png" alt="gb"/> 90 </html:link> 91 </logic:notEqual> 92 <logic:equal name="lang" value="en"> 93 <html:link page="/French.do" paramName="relativePageUri" paramId="requestUri" titleKey="app.fr"> 94 <html:img page="/resources/images/utils/fr.png" alt="fr"/> 95 </html:link> 96 </logic:equal> 97 98 </div> 99 100 <div id="plan"> 101 <%-- le menu --%> 102 <div id="menuItem"> 103 <bean:define id="upload" value="upload"/> 104 <bean:define id="access" value="access"/> 105 <ul> 106 <li><html:link page="/data/access/access.jsp" paramName="access" paramId="source"> 107 <bean:message key="data.access"/> 108 </html:link> 109 </li> 110 <li> > 111 <html:link page="/JeuxAccess.do"> 112 <bean:message key="data.access.jeux"/> 113 </html:link> 114 </li> 115 <li> > 116 <html:link page="/ParametresAccess.do"> 117 <bean:message key="data.access.param"/> 118 </html:link> 119 </li> 120 <li> > 121 <html:link page="/CapteursAccess.do"> 122 <bean:message key="data.access.capt"/> 123 </html:link> 124 </li> 125 <li> > 126 <html:link page="/PlateformesAccess.do"> 127 <bean:message key="data.access.plat"/> 128 </html:link> 129 </li> 130 131 <li><br/> 132 <logic:notPresent name="SES_USER" scope="session"> 133 <html:link page="/InitLogonAccess.do" paramName="access" paramId="source"> 134 <bean:message key="data.access.extract"/> 135 </html:link> 136 </logic:notPresent> 137 <logic:present name="SES_USER" scope="session"> 138 <html:link page="/DataAccess.do"> 139 <bean:message key="data.access.extract"/> 140 </html:link> 141 </logic:present> 142 </li> 143 <li> 144 <logic:notPresent name="SES_USER" scope="session"> 145 <html:link page="/InitLogon.do" paramName="upload" paramId="source"> 146 <bean:message key="data.upload"/> 147 </html:link> 148 </logic:notPresent> 149 <logic:present name="SES_USER" scope="session"> 150 <html:link page="/PrepareTree.do"> 151 <bean:message key="data.upload"/> 152 </html:link> 153 </logic:present> 154 </li> 155 156 <!-- ****************************************************************** --> 157 <!-- ************************ VISUALIZATION *************************** --> 158 <!-- ****************************************************************** --> 159 <li><br/> 160 <html:link page="/visualization?methodName=view"> 161 <bean:message key="all.visualization"/> 162 </html:link> 163 </li> 164 <li> > 165 <html:link page="/visualization?methodName=viewParametersByPlateform"> 166 <bean:message key="data.visualization"/> 167 </html:link> 168 </li> 169 <li> > 170 <html:link page="/visualization/inWork.jsp"> 171 <bean:message key="simulation.visualization"/> 172 </html:link> 173 </li> 174 <!-- ****************************************************************** --> 175 176 </ul> 177 </div> 178 <table width="100%"> 179 <tr> 180 <td align="center"> 181 <html:link href="http://megapoli.dmi.dk/" target="help" titleKey="app.linkmegapoli"> 182 <html:img page="/resources/images/megapoli/megapoli_small.jpg" height="100px" 183 width="100px" altKey="app.home"/> 184 </html:link> 185 </td> 186 </tr> 187 </table> 188 </div> 189 <%-- Recherche : solution mnogosearch --%> 190 192 191 </div> 193 </div> 194 <div id="blabla"> 195 <div id="title"> 196 <%-- le titre de la page --%> 197 <h1><tiles:insert attribute="bodytitle"/></h1> 198 </div> 199 <div id="txt"> 200 <%-- le corps de la page --%> 201 <tiles:insert attribute="body"/> 202 </div> 203 </div> 192 <%-- 193 <div id="recherche"> 194 <form method="get" action="/megapoli/cgi-bin/search.cgi"> 195 <bean:message key="app.search"/> : <INPUT TYPE="text" NAME="q" VALUE="" size="20"> 196 </form> 197 </div> 198 --%> 199 <div id="pageContent"> 200 <div id="nav"> 201 <%-- la barre de navigation --%> 202 <div class="texte navStyle" style="float: left;"> 203 <tiles:insert attribute="nav"/> 204 </div> 205 <div style="float: right; font-size: 13px"> 206 <logic:present name="SES_USER" scope="session"> 207 <table> 208 <tr> 209 <td height="40px" valign="middle" style="font-size: 13px; color: white"> 210 <bean:write name="SES_USER" property="prenom"/> <bean:write name="SES_USER" 211 property="nom"/> 212 <logic:equal name="SES_USER" property="roles" value="coordinateur"> 213 (<bean:message key="app.admin"/>) 214 </logic:equal> 215 </td> 216 <td valign="top" width="40px"> 217 <html:link page="/Disconnect.do"> 218 <html:img page="/resources/images/utils/logout.gif" titleKey="app.disconnect" 219 altKey="app.disconnect" 220 onmouseover="this.src='${chemin}/resources/images/utils/logout2.gif'" 221 onmouseout="this.src='${chemin}/resources/images/utils/logout.gif'" 222 width="20px" height="20px" style="margin-top:7px"/> 223 </html:link> 224 </td> 225 </tr> 226 </table> 227 </logic:present> 228 </div> 229 </div> 230 <div id="corpsPage"> 231 <div id="title"> 232 <%-- le titre de la page --%> 233 <h1><tiles:insert attribute="bodytitle"/></h1> 234 </div> 235 <div id="txt"> 236 <%-- le corps de la page --%> 237 <tiles:insert attribute="body"/> 238 </div> 239 </div> 240 </div> 204 241 </div> 205 </div> 206 207 208 <div id="pageFooter"> 209 <div id="copyright"> 210 © 2010 Sedoo / CNRS 211 </div> 212 <div id="datestamp"> 213 <bean:message key="app.lastModified"/> : <bean:write name="lastModified"/> 214 </div> 215 </div> 216 217 218 </div> 242 243 244 <div id="pageFooter"> 245 <table width="100%" style="color:white;font-size: 12px"> 246 <tr> 247 <td align="left">© 2010-2011 <html:link href="http://www.sedoo.fr" target="help" titleKey="app.linksedoo">Sedoo</html:link> / CNRS </td> 248 <td align="center"><bean:message key="app.infonavig"/></td> 249 <td align="right"><i><bean:message key="app.lastModified"/> : <bean:write name="lastModified"/></i></td> 250 </tr> 251 </table> 252 </div> 219 253 220 254 </BODY> -
ether_megapoli/trunk/web/src/ApplicationResources.properties
r136 r170 427 427 ################################################################ 428 428 inWork=Page en cours de construction.. 429 430 data.visualization=Visualisation des donn\u00E9es 431 data.visualization.parameter_pf=D'un type de mesure \u00E0 une plateforme 432 data.visualization.parameter_pfs=D'un type de mesure \u00E0 plusieurs plateformes 433 data.visualization.parameters_pf=De diff\u00E9rents types de mesure \u00E0 une plateforme 429 all.visualization=Visualisation 430 431 data.visualization=Des donn\u00E9es 434 432 data.visualization.2D=2D 435 433 data.visualization.title=Visualisation corr\u00E9latives des observations … … 465 463 data.visualization.axeType.Latitude=Latitude / Longitude 466 464 467 simulation.visualization= Visualisation des simulations465 simulation.visualization=Des simulations 468 466 469 467 ####################### PLOT ####################### -
ether_megapoli/trunk/web/src/ApplicationResources_en.properties
r136 r170 426 426 ################################################################ 427 427 inWork=Work in progress.. 428 429 data.visualization=Datas visualisation 430 data.visualization.parameter_pf=Parameter by plateform 431 data.visualization.parameter_pfs=Parameter by plateforms 432 data.visualization.parameters_pf=Parameters by plateform 428 all.visualization=Visualization 429 430 data.visualization=Datas 433 431 data.visualization.2D=2D 434 432 data.visualization.title=Observations visualisation … … 464 462 data.visualization.axeType.Latitude=Latitude / Longitude 465 463 466 simulation.visualization=Simulations visualization464 simulation.visualization=Simulations 467 465 468 466 ####################### PLOT ####################### -
ether_megapoli/trunk/web/visualization/inWork.jsp
r89 r170 1 <%@ page import="com.medias.Context"%>2 1 <%@ page import="com.medias.Context" %> 3 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> 4 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles"%> 5 <%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean"%> 2 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> 3 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %> 4 <%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %> 5 <%@ taglib prefix="ether" tagdir="/WEB-INF/tags" %> 6 6 7 <tiles:insert page="/resources/templates/template.jsp" flush="true"> 7 8 8 <tiles:insert page="/resources/templates/templateEther.jsp" flush="true">9 <tiles:put name="nav" value=''/> 9 10 10 <bean:define type="java.lang.String" id="relativePath" 11 value="<%=Context.getRelativePath(request)%>" /> 11 <tiles:put name="title" type="string"> 12 <bean:message key="app.title"/> - <bean:message key="app.welcome"/> 13 </tiles:put> 12 14 13 <tiles:put name="nav" type="string"> 14 <html:link page="/index.jsp"> 15 <bean:message key="app.home" /> 16 </html:link>> 17 </tiles:put> 18 <tiles:put name="title" type="string"> 19 <bean:message key="app.title" /> - <bean:message key="app.welcome" /> 20 </tiles:put> 15 <tiles:put name="bodytitle" type="string"> 16 <bean:message key="inWork"/> 17 </tiles:put> 21 18 22 <tiles:put name="bodytitle" type="string"> 23 <bean:message key="inWork" /> 24 </tiles:put> 25 26 <tiles:put name="body" type="string"> 27 </tiles:put> 19 <tiles:put name="body" type="string"> 20 </tiles:put> 28 21 29 22 </tiles:insert> -
ether_megapoli/trunk/web/visualization/nav_visu.jsp
r160 r170 1 1 <%@ page language="java" contentType="text/html; charset=UTF-8"%> 2 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles"%>3 2 <%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html"%> 4 3 <%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean"%> 5 <%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic"%> 4 6 5 <!-- barre décrivant la position de la page dans l'arborescence du site --> 7 <html:link page="/index.jsp"><bean:message key="app.home"/></html:link>> 8 <html:link page="/partenaires/partenaires.jsp"><bean:message key="partenaires"/></html:link>> 6 <ul> 7 <li><html:link page="/index.jsp"><bean:message key="app.home"/></html:link>></li> 8 <li><html:link page="/visualization?methodName=view"><bean:message key="all.visualization"/></html:link></li> 9 </ul> -
ether_megapoli/trunk/web/visualization/visu.jsp
r89 r170 1 <%@ page import="com.medias.Context"%>2 1 <%@ page import="com.medias.Context" %> 3 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> 4 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles"%> 5 <%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean"%> 6 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> 7 2 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> 3 <%@ taglib uri="/WEB-INF/tlds/struts-tiles.tld" prefix="tiles" %> 4 <%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %> 5 <%@ taglib prefix="ether" tagdir="/WEB-INF/tags" %> 8 6 9 7 <tiles:insert page="/resources/templates/templateEther.jsp" flush="true"> 10 8 11 <bean:define type="java.lang.String" id="relativePath" value="<%=Context.getRelativePath(request)%>" /> 12 <tiles:put name="nav" value=''/> 9 <tiles:put name="title" type="string"> 10 <bean:message key="app.title"/> - <bean:message key="app.welcome"/> 11 </tiles:put> 13 12 14 <tiles:put name="title" type="string">15 <bean:message key="app.title" /> - <bean:message key="app.welcome"/>16 13 <tiles:put name="insertCss" type="string"> 14 <ether:htmlCss cssFile="ether"/> 15 </tiles:put> 17 16 18 <tiles:put name="bodytitle" type="string"> 19 <bean:message key="data.visualization.title" /> 20 </tiles:put> 17 <tiles:put name="insertJsOrJsp" type="string"> 18 </tiles:put> 21 19 22 <tiles:put name="body" type="string"> 23 - Liste des sites et types de mesure<br> 24 - Photo des stations<br> 25 - etc... 26 </tiles:put> 20 <bean:define type="java.lang.String" id="relativePath" value="<%=Context.getRelativePath(request)%>"/> 21 <tiles:put name="nav" value='<%=relativePath+"/nav_visu.jsp"%>'/> 22 23 <tiles:put name="bodytitle" type="string"> 24 <bean:message key="data.visualization.title"/> 25 </tiles:put> 26 27 <tiles:put name="body" type="string"> 28 - Liste des sites et types de mesure<br> 29 - Photo des stations<br> 30 - etc... 31 </tiles:put> 27 32 28 33 </tiles:insert> -
ether_megapoli/trunk/web/visualization/visu_parameter_by_pf.jsp
r132 r170 1 1 <!-- /*** ****************** VISU ******************** **/ --> 2 <%@ page import="com.medias.Context" %>3 2 <%@ page import="com.ether.AxeTypeForFixedPlateform" %> 4 3 <%@ page import="com.ether.AxeTypeForMobilePlateform" %> 4 <%@ page import="com.medias.Context" %> 5 5 6 6 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> … … 8 8 <%@ taglib uri="/WEB-INF/tlds/struts-bean.tld" prefix="bean" %> 9 9 <%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %> 10 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>11 10 <%@ taglib prefix="ether" tagdir="/WEB-INF/tags" %> 12 11 … … 18 17 19 18 <tiles:put name="insertCss" type="string"> 19 <ether:htmlCss cssFile="ether"/> 20 <ether:htmlCss cssFile="button"/> 21 <ether:htmlCss cssFile="blueprint-css/blueprint/src/grid"/> 22 20 23 <ether:htmlCss cssFile="visu_parameter_by_pf"/> 21 24 <ether:htmlCss cssFile="select"/> … … 48 51 49 52 <bean:define type="java.lang.String" id="relativePath" value="<%=Context.getRelativePath(request)%>"/> 50 <tiles:put name="nav" value=' '/>53 <tiles:put name="nav" value='<%=relativePath+"/nav_visu_parameter.jsp"%>'/> 51 54 52 55 … … 73 76 <div id="generalContainerOptions" class="span-10 last"> 74 77 <div id="containerOptionCalendar" class="span-10"> 75 <div id="messages" class="messagesHeight"><bean:message key="data.visualization.selectPeriod"/></div> 78 <div id="messages" class="messagesHeight"><bean:message 79 key="data.visualization.selectPeriod"/></div> 76 80 <input type="text" id="beginDate" size="15"/> 77 81 <input type="text" id="endDate" size="15"/>
Note: See TracChangeset
for help on using the changeset viewer.