Changeset 253
- Timestamp:
- 11/16/11 18:28:31 (13 years ago)
- Location:
- ether_megapoli/trunk/web
- Files:
-
- 1 deleted
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
ether_megapoli/trunk/web/data/dataResume.jsp
r247 r253 24 24 25 25 <bean:message key="data.access.intro4"/> 26 26 27 <ul> 27 <li> 28 <logic:notPresent name="SES_USER" scope="session"> 29 <html:link page="/InitLogonAccess.do" paramName="access" paramId="source"><bean:message 30 key="data.access.extract"/></html:link> 31 </logic:notPresent> 32 <logic:present name="SES_USER" scope="session"> 33 <html:link page="/DataAccess.do"><bean:message key="data.access.extract"/></html:link> 34 </logic:present> 35 : <bean:message key="data.access.intro2"/> 36 </li> 37 <li> 38 <logic:notPresent name="SES_USER" scope="session"> 39 <html:link page="/InitLogonAccess.do" paramName="upload" paramId="source"><bean:message 40 key="data.upload"/></html:link> 41 </logic:notPresent> 42 <logic:present name="SES_USER" scope="session"> 43 <html:link page="/PrepareTree.do"><bean:message key="data.upload"/></html:link> 44 </logic:present> 45 : <bean:message key="data.upload.intro"/> 46 </li> 28 <li><bean:message key="data.access.extract"/> : <bean:message key="data.access.intro2"/></li> 29 <li><bean:message key="data.upload"/> : <bean:message key="data.upload.intro"/></li> 47 30 </ul> 48 31 </tiles:put> -
ether_megapoli/trunk/web/data/desc_parameter.jsp
r247 r253 15 15 <html:link page="/index.jsp"><bean:message key="app.home"/></html:link> > 16 16 <html:link page="/data?methodName=viewCatalogResume"><bean:message key="data.access"/></html:link> > 17 <html:link page="/ data?methodName=viewParameters"><bean:message key="data.access.param"/></html:link>17 <html:link page="/ParametresAccess.do"><bean:message key="data.access.param"/></html:link> 18 18 </tiles:put> 19 19 … … 185 185 </table> 186 186 <div class="hdp" align="right"> 187 <html:link page="/data?methodName=viewDescParameter" anchor="top" titleKey="app.hdp">187 <html:link href="#top" titleKey="app.hdp"> 188 188 <html:img page="/resources/images/utils/fleche_haut.gif" width="20px" height="20px"/> 189 189 </html:link> -
ether_megapoli/trunk/web/data/desc_plateform.jsp
r247 r253 16 16 <html:link page="/index.jsp"><bean:message key="app.home"/></html:link> > 17 17 <html:link page="/data?methodName=viewCatalogResume"><bean:message key="data.access"/></html:link> > 18 <html:link page="/ data?methodName=viewPlateforms"><bean:message key="data.access.plat"/></html:link>18 <html:link page="/PlateformesAccess.do"><bean:message key="data.access.plat"/></html:link> 19 19 </tiles:put> 20 20 … … 248 248 249 249 <div class="hdp" align="right"> 250 <html:link page="/data?methodName=viewDescPlateform" anchor="top" titleKey="app.hdp">250 <html:link href="#top" titleKey="app.hdp"> 251 251 <html:img page="/resources/images/utils/fleche_haut.gif" width="20px" height="20px"/> 252 252 </html:link> -
ether_megapoli/trunk/web/data/desc_sensor.jsp
r247 r253 16 16 <html:link page="/index.jsp"><bean:message key="app.home"/></html:link> > 17 17 <html:link page="/data?methodName=viewCatalogResume"><bean:message key="data.access"/></html:link> > 18 <html:link page="/ data?methodName=viewSensors"><bean:message key="data.access.capt"/></html:link>18 <html:link page="/CapteursAccess.do"><bean:message key="data.access.capt"/></html:link> 19 19 </tiles:put> 20 20 … … 189 189 190 190 <div class="hdp" align="right"> 191 <html:link page="/data?methodName=viewDescSensor" anchor="top" titleKey="app.hdp">191 <html:link href="#top" titleKey="app.hdp"> 192 192 <html:img page="/resources/images/utils/fleche_haut.gif" width="20px" height="20px"/> 193 193 </html:link> -
ether_megapoli/trunk/web/data/jeux.jsp
r247 r253 17 17 <html:link page="/index.jsp"><bean:message key="app.home"/></html:link> > 18 18 <html:link page="/data?methodName=viewCatalogResume"><bean:message key="data.access"/></html:link> > 19 <html:link page="/ data?methodName=viewSets"><bean:message key="data.access.jeux"/></html:link>19 <html:link page="/JeuxAccess.do"><bean:message key="data.access.jeux"/></html:link> 20 20 </tiles:put> 21 21 … … 26 26 <div id="errors"><html:errors/></div> 27 27 <div id="messages"> 28 <html:messages id="mess" property="<%= org.apache.struts.action.ActionMessages.GLOBAL_MESSAGE %>" 29 message="true"> 28 <html:messages id="mess" property="<%= org.apache.struts.action.ActionMessages.GLOBAL_MESSAGE %>" message="true"> 30 29 <bean:write name="mess"/> 31 30 </html:messages> … … 272 271 273 272 <div class="hdp" align="right"> 274 <html:link page="/data?methodName=viewSets" anchor="top" titleKey="app.hdp">273 <html:link href="#top" titleKey="app.hdp"> 275 274 <html:img page="/resources/images/utils/fleche_haut.gif" width="20px" height="20px"/> 276 275 </html:link> -
ether_megapoli/trunk/web/data/metadataInfo.jsp
r247 r253 16 16 <html:link page="/index.jsp"><bean:message key="app.home"/></html:link> > 17 17 <html:link page="/data?methodName=viewCatalogResume"><bean:message key="data.access"/></html:link> > 18 <html:link page="/ data?methodName=viewSets"><bean:message key="data.access.jeux"/></html:link>18 <html:link page="/JeuxAccess.do"><bean:message key="data.access.jeux"/></html:link> 19 19 </tiles:put> 20 20 … … 69 69 </nested:nest> 70 70 <div class="hdp" align="right"> 71 <html:link page="/data?methodName=viewMetadataInfo" anchor="top" titleKey="app.hdp">71 <html:link href="#top" titleKey="app.hdp"> 72 72 <html:img page="/resources/images/utils/fleche_haut.gif" width="20px" height="20px"/> 73 73 </html:link> … … 296 296 </nested:nest> 297 297 <div class="hdp" align="right"> 298 <html:link page="/data?methodName=viewMetadataInfo" anchor="top" titleKey="app.hdp">298 <html:link href="#top" titleKey="app.hdp"> 299 299 <html:img page="/resources/images/utils/fleche_haut.gif" width="20px" height="20px"/> 300 300 </html:link> … … 373 373 </table> 374 374 <div class="hdp" align="right"> 375 <html:link page="/data?methodName=viewMetadataInfo" anchor="top" titleKey="app.hdp">375 <html:link href="#top" titleKey="app.hdp"> 376 376 <html:img page="/resources/images/utils/fleche_haut.gif" width="20px" height="20px"/> 377 377 </html:link> … … 425 425 </table> 426 426 <div class="hdp" align="right"> 427 <html:link page="/data?methodName=viewMetadataInfo" anchor="top" titleKey="app.hdp">427 <html:link href="#top" titleKey="app.hdp"> 428 428 <html:img page="/resources/images/utils/fleche_haut.gif" width="20px" height="20px"/> 429 429 </html:link> … … 502 502 </div> 503 503 <div class="hdp" align="right"> 504 <html:link page="/data?methodName=viewMetadataInfo" anchor="top" titleKey="app.hdp">504 <html:link href="#top" titleKey="app.hdp"> 505 505 <html:img page="/resources/images/utils/fleche_haut.gif" width="20px" height="20px"/> 506 506 </html:link> … … 592 592 </nested:nest> 593 593 <div class="hdp" align="right"> 594 <html:link page="/data?methodName=viewMetadataInfo" anchor="top" titleKey="app.hdp">594 <html:link href="#top" titleKey="app.hdp"> 595 595 <html:img page="/resources/images/utils/fleche_haut.gif" width="20px" height="20px"/> 596 596 </html:link> -
ether_megapoli/trunk/web/data/parameter.jsp
r247 r253 17 17 <html:link page="/index.jsp"><bean:message key="app.home"/></html:link> > 18 18 <html:link page="/data?methodName=viewCatalogResume"><bean:message key="data.access"/></html:link> > 19 <html:link page="/ data?methodName=viewParameters"><bean:message key="data.access.param"/></html:link>19 <html:link page="/ParametresAccess.do"><bean:message key="data.access.param"/></html:link> 20 20 </tiles:put> 21 21 … … 79 79 80 80 <div class="hdp" align="right"> 81 <html:link page="/data?methodName=viewParameters" anchor="top" titleKey="app.hdp">81 <html:link href="#top" titleKey="app.hdp"> 82 82 <html:img page="/resources/images/utils/fleche_haut.gif" width="20px" height="20px"/> 83 83 </html:link> -
ether_megapoli/trunk/web/data/plateform.jsp
r247 r253 17 17 <html:link page="/index.jsp"><bean:message key="app.home"/></html:link> > 18 18 <html:link page="/data?methodName=viewCatalogResume"><bean:message key="data.access"/></html:link> > 19 <html:link page="/ data?methodName=viewPlateforms"><bean:message key="data.access.plat"/></html:link>19 <html:link page="/PlateformesAccess.do"><bean:message key="data.access.plat"/></html:link> 20 20 </tiles:put> 21 21 … … 113 113 114 114 <div class="hdp" align="right"> 115 <html:link page="/data?methodName=viewPlateforms" anchor="top" titleKey="app.hdp">115 <html:link href="#top" titleKey="app.hdp"> 116 116 <html:img page="/resources/images/utils/fleche_haut.gif" width="20px" height="20px"/> 117 117 </html:link> -
ether_megapoli/trunk/web/data/sensor.jsp
r247 r253 17 17 <html:link page="/index.jsp"><bean:message key="app.home"/></html:link> > 18 18 <html:link page="/data?methodName=viewCatalogResume"><bean:message key="data.access"/></html:link> > 19 <html:link page="/ data?methodName=viewSensors"><bean:message key="data.access.capt"/></html:link>19 <html:link page="/CapteursAccess.do"><bean:message key="data.access.capt"/></html:link> 20 20 </tiles:put> 21 21 … … 92 92 93 93 <div class="hdp" align="right"> 94 <html:link page="/data?methodName=viewSensors" anchor="top" titleKey="app.hdp">94 <html:link href="#top" titleKey="app.hdp"> 95 95 <html:img page="/resources/images/utils/fleche_haut.gif" width="20px" height="20px"/> 96 96 </html:link> -
ether_megapoli/trunk/web/project/login.jsp
r251 r253 22 22 <tiles:put name="body" type="string"> 23 23 <bean:message key="data.authentification.intro"/> 24 <div id="errors" class="containerErrors"><html:errors/></div>25 24 26 25 <script type="text/javascript"> 27 window.onload=function(){ 26 window.onload = function() 27 { 28 28 $( "fieldset#signin_menu" ).toggle(); 29 29 $( ".signin" ).toggleClass( "menu-open" ); 30 30 } 31 31 </script> 32 33 <%-- <div id="login">34 <html:form action="/LogonAccess">35 <table>36 <tr>37 <td><bean:message key="data.authentification.login"/> :</td>38 <td><html:text property="login"/></td>39 </tr>40 <tr>41 <td><bean:message key="data.authentification.pwd"/> :</td>42 <td><html:password property="pwd"/></td>43 </tr>44 <tr>45 <td> </td>46 <td align="right">47 <html:submit><bean:message key="app.submit"/></html:submit>48 <html:cancel><bean:message key="app.cancel"/></html:cancel>49 </td>50 </tr>51 </table>52 </html:form>53 </div>--%>54 32 </tiles:put> 55 33 </tiles:insert> -
ether_megapoli/trunk/web/resources/jsp/megapoliHead.jsp
r251 r253 9 9 this.containerTitle = $( "#title" ); 10 10 this.containerTools = $( "#tools" ); 11 this.containerMenuData = $( "#menuData" ); 11 12 12 13 /** *********** VARIABLES *********** **/ … … 22 23 this.createTitle(); 23 24 this.createTools(); 25 this.createMenuData(); 24 26 this.createLeftSlides(); 25 27 }, … … 168 170 }, 169 171 172 createMenuData: function() 173 { 174 this.containerMenuData.empty(); 175 176 var ulData = $( document.createElement( "ul" ) ); 177 this.containerMenuData.append( ulData ); 178 179 var liExtract = $( document.createElement( "li" ) ); 180 var aExtract = $( document.createElement( "a" ) ); 181 aExtract.html( "<span>" + templateTexts["data.access.extract.short"] + "</span>" ); 182 liExtract.append( aExtract ); 183 ulData.append( liExtract ); 184 var liDownload = $( document.createElement( "li" ) ); 185 var aDownload = $( document.createElement( "a" ) ); 186 aDownload.html( "<span>" + templateTexts["data.upload.short"] + "</span>" ); 187 liDownload.append( aDownload ); 188 ulData.append( liDownload ); 189 190 if( getJSONUser() ) 191 { 192 aExtract.attr( {href:"DataAccess.do"} ); 193 aDownload.attr( {href:"PrepareTree.do"} ); 194 } 195 else 196 { 197 aExtract.attr( {href:"project?methodName=viewLogin"} ); 198 aDownload.attr( {href:"project?methodName=viewLogin"} ); 199 } 200 }, 201 170 202 createLeftSlides: function() 171 203 { … … 206 238 setJSONUser( null != jQuery.parseJSON( result ).jSONPeople ? jQuery.parseJSON( result ).jSONPeople : false ); 207 239 if( null == this.errors ) 208 this. hideLogin();240 this.updateLogin(); 209 241 else 210 242 displayLoginErrors( templateTexts[this.errors] ); … … 217 249 { 218 250 setJSONUser( false ); 219 this. hideLogin();251 this.updateLogin(); 220 252 } 221 253 else … … 272 304 }, 273 305 274 hideLogin: function()306 updateLogin: function() 275 307 { 276 308 this.containerTools.empty(); 277 309 this.createTools(); 310 this.createMenuData(); 278 311 } 279 312 } ); -
ether_megapoli/trunk/web/resources/templates/templateMegapoli.jsp
r251 r253 100 100 <span><bean:message key="app.data"/></span> 101 101 </html:link> 102 <div> 103 <ul> 104 <logic:notPresent name="SES_USER" scope="session"> 105 <li><html:link page="/InitLogonAccess.do" paramName="access" paramId="source"><span><bean:message key="data.access.extract.short"/></span></html:link></li> 106 <li><html:link page="/InitLogonAccess.do" paramName="upload" paramId="source"><span><bean:message key="data.upload.short"/></span></html:link></li> 107 </logic:notPresent> 108 <logic:present name="SES_USER" scope="session"> 109 <li><html:link page="/DataAccess.do"><span><bean:message key="data.access.extract.short"/></span></html:link></li> 110 <li><html:link page="/PrepareTree.do"><span><bean:message key="data.upload.short"/></span></html:link></li> 111 </logic:present> 112 </ul> 113 </div> 102 <div id="menuData"></div> 114 103 </li> 115 104 … … 172 161 templateTexts["data.authentification"] = "<bean:message key="data.authentification"/>"; 173 162 templateTexts["data.authentification.text"] = "<bean:message key="data.authentification.text"/>"; 163 templateTexts["data.access.extract.short"] = '<bean:message key="data.access.extract.short"/>'; 164 templateTexts["data.upload.short"] = '<bean:message key="data.upload.short"/>'; 174 165 175 166 var interfaceTemplate = new InterfaceTemplate();
Note: See TracChangeset
for help on using the changeset viewer.